First "official" release from CJ-Systems

'

AUTHORS

@@ -10,7 +10,9 @@ Peter van der Does
 Vincent Driessen
 Daniel Dehennin
 Benedikt Böhm
+ChrisjStone
 Leonid Komarovsky
+Chris Stone
 Felipe Talavera
 Randy Merrill
 Kevin Woo
@@ -20,26 +22,27 @@ Fred Condo
 Alexandre Dutra
 Andreas Heiduk
 Ben Loveridge
-ChrisjStone
 Florian Gamböck
 Gergely Nagy
 JP Toto
+James Skemp
 Kiall Mac Innes
 Lorin Hochstein
 Luis Fernando Gomes
+Matthew Franglen
 Olivier Mengué
 Oppodelldog
 Pokey Rule
 Silas Palmer
 Stefan Näwe
+gpongelli
 Adam Gibbins
 Alexander Groß
 Alexander Norström
 Alexander Zeitler
 Brian St. Pierre
 Cararus Eugeniu
 Chad Walker
-Chris Stone
 Craig Fowler
 Emre Berge Ergenekon
 Gene Pavlovsky
@@ -80,7 +83,6 @@ Vedang Manerikar
 Zheeeng
 eddie cianci
 gmallard
-gpongelli
 raybec
 
 

README.md

@@ -10,17 +10,17 @@ blog post"). This fork adds functionality not added to the original branch.
 For the best introduction to get started with `git flow`, please read Jeff
 Kreeftmeijer's blog post:
 
-[http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/](http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/)
+[Using git-flow to automate your git branching workflow](https://jeffkreeftmeijer.com/git-flow/)
 
 Or have a look at one of these screen casts:
 
-* [How to use a scalable Git branching model called git-flow](http://buildamodule.com/video/change-management-and-version-control-deploying-releases-features-and-fixes-with-git-how-to-use-a-scalable-git-branching-model-called-gitflow) (by Build a Module)
-* [A short introduction to git-flow](http://vimeo.com/16018419) (by Mark Derricutt)
-* [On the path with git-flow](https://vimeo.com/codesherpas/on-the-path-gitflow) (by Dave Bock)
+* [How to use a scalable Git branching model called git-flow](https://www.youtube.com/watch?v=-8DgENtFWSU) (by Build a Module)
+* [A short introduction to git-flow](https://vimeo.com/16018419) (by Mark Derricutt)
+* [On the path with git-flow](https://vimeo.com/37408017) (by Dave Bock)
 
 A quick cheatsheet was made by Daniel Kummer:
 
-[http://danielkummer.github.io/git-flow-cheatsheet/](http://danielkummer.github.io/git-flow-cheatsheet/)
+[https://danielkummer.github.io/git-flow-cheatsheet/](https://danielkummer.github.io/git-flow-cheatsheet/)
 
 ## Installing git-flow
 
@@ -29,11 +29,11 @@ See the Wiki for up-to-date [Installation Instructions](https://github.com/CJ-Sy
 
 ## Integration with your shell
 
-For those who use the [Bash](http://www.gnu.org/software/bash/) or [ZSH](http://www.zsh.org)
+For those who use the [Bash](https://www.gnu.org/software/bash/) or [ZSH](https://www.zsh.org/)
 shell, you can use my [fork of git-flow-completion](https://github.com/petervanderdoes/git-flow-completion)
 which includes several additions for git-flow (AVH Edition), or you can use the
-original [git-flow-completion](http://github.com/bobthecow/git-flow-completion)
-project by [bobthecow](http://github.com/bobthecow). Both offer tab-completion
+original [git-flow-completion](https://github.com/bobthecow/git-flow-completion)
+project by [bobthecow](https://github.com/bobthecow). Both offer tab-completion
 for git-flow subcommands and branch names with my fork including tab-completion
 for the commands not found in the original git-flow.
 
@@ -58,7 +58,7 @@ Feel free to fork this repository and to commit your additions. For a list of
 all contributors, please see the [AUTHORS](AUTHORS) file.
 
 Any questions, tips, or general discussion can be posted to the Google group:
-[http://groups.google.com/group/gitflow-users](http://groups.google.com/group/gitflow-users)
+[http://groups.google.com/group/gitflow-users](https://groups.google.com/g/gitflow-users)
 This is the original group set up to support the nvie branch, but I am monitoring
 the list as well for any questions related to my version.
 When you do post a question on the list please indicate which version you are,
@@ -69,8 +69,8 @@ using the complete version number.
 Fork the repository.  Then, run:
 
 ```shell
-git clone -b master [email protected]:<username>/gitflow-avh.git
-cd gitflow-avh
+git clone -b master [email protected]:<username>/gitflow-cjs.git
+cd gitflow-cjs
 ```
 
 The `-b master` switch has to be added since the fork operation automatically
@@ -118,7 +118,7 @@ those questions to accept the (sane) default suggestions.
 
 The ``-d`` flag will accept all defaults.
 
-![Screencast git flow init](http://i.imgur.com/lFQbY5V.gif)
+![Screencast git flow init](https://i.imgur.com/lFQbY5V.gif)
 
 ### Creating feature/release/hotfix/support branches
 

git-flow-bugfix

@@ -109,15 +109,15 @@ v,verbose   Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $bugfix_branches; do
-		base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
-		develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
+			develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$develop_sha" ]; then
 				printf "(no commits yet)"

git-flow-feature

@@ -109,15 +109,15 @@ v,verbose   Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $feature_branches; do
-		base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
-		develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
+			develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$develop_sha" ]; then
 				printf "(no commits yet)"

git-flow-hotfix

@@ -105,15 +105,15 @@ v,verbose!        Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $hotfix_branches; do
-		base=$(git merge-base "$branch" "$MASTER_BRANCH")
-		master_sha=$(git rev-parse "$MASTER_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$MASTER_BRANCH")
+			master_sha=$(git rev-parse "$MASTER_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$master_sha" ]; then
 				printf "(no commits yet)"

git-flow-release

@@ -494,15 +494,15 @@ v,verbose!        verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $release_branches; do
-		base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
-		develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
+			develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$develop_sha" ]; then
 				printf "(no commits yet)"

git-flow-support

@@ -103,15 +103,15 @@ v,verbose         Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $support_branches; do
-		base=$(git merge-base "$branch" "$MASTER_BRANCH")
-		master_sha=$(git rev-parse "$MASTER_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$MASTER_BRANCH")
+			master_sha=$(git rev-parse "$MASTER_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$master_sha" ]; then
 				printf "(no commits yet)"

git-flow-version

@@ -38,7 +38,7 @@
 #
 
 
-GITFLOW_VERSION=1.12.4
+GITFLOW_VERSION=1.12.5
 
 initialize() {
 	# A function can not be empty. Comments count as empty.

gitflow-avh.plugin.zsh

@@ -0,0 +1,23 @@
+# This allows the gitflow-avh commands to be installed in ZSH using antigen.
+# Antigen is a bundle manager. It allows you to enhance the functionality of
+# your zsh session by installing bundles and themes easily.
+
+# Antigen documentation:
+# http://antigen.sharats.me/
+# https://github.com/zsh-users/antigen
+
+# Install gitflow-avh with antigen:
+# antigen bundle CJ-Systems/gitflow-cjs --branch=master
+# Bundles installed by antigen are available for use immediately.
+
+# Update gitflow-avh (and all other antigen bundles):
+# antigen update
+
+# The antigen command will download the git repository to a folder and then
+# execute an enabling script (this file). The complete process for loading the
+# code is documented here:
+# https://github.com/zsh-users/antigen#notes-on-writing-plugins
+
+# This specific script just adds the project folder to the PATH. This makes all
+# commands available in git.
+export PATH="${PATH}":`dirname "${0}"`