Merge branch 'release/1.1.0'

AUTHORS

@@ -2,12 +2,14 @@ git-flow AVH Authors
 
 This software consists of voluntary contributions made by many
 individuals. For exact contribution history, see the revision history
-and logs, available at http://github.com/petervanderdoes/gitflow.
+(Changes.mdown) and logs, available at 
+http://github.com/petervanderdoes/gitflow.
 
 
 Vincent Driessen
 Peter van der Does
 Benedikt Böhm
+Daniel Dehennin
 Felipe Talavera
 Randy Merrill
 Daniel Truemper

Changes.mdown

@@ -5,24 +5,118 @@
 [bloomonkey]: https://github.com/bloomonkey
 [mallamanis]: https://github.com/mallamanis
 [kperi]: https://github.com/kperi
+[gvangool]: https://github.com/gvangool
+[baby-gnu]: https://github.com/baby-gnu
+[pcragone]: https://github.com/pcragone
+[mykehsd]: https://github.com/mykehsd
 
 # Changelog
 
+#### 1.1.0
+[Peter van der Does][petervanderdoes]
+* Bugfix: feature finish does double merge when using squash option.
+
+* Add the ability to keep/delete local/remote branches on finish.  
+  When finishing a release/hotfix/feature you now can keep/delete the 
+  local/remote release/hotfix/feature branch.
+
+* New command: git flow release branch  
+  With this command you can directly release a given branch. There is no need 
+  to start a new release and finish it. You can not use this command on the 
+  git-flow branches feature/hotfix/release/support.
+
+* Do not display object fetch summary if flag was not set.  
+  Thanks to [Daniel Dehennin][baby-gnu].
+
+* Bugfix: Checking if branch exists will fail for remote branches.
+
+* Make die output consistent for each die case.
+
+* Bugfix: When running git flow init an error message pops up.
+
+* Show correct help for subactions.  
+  When requesting help with -h for the subactions, the help would show the 
+  incorrect command line.
+
+* Support reading the tag message from a file in release/hotfix finish.  
+  Add the option -f,--messagefile to release and hotfix finish. Thanks to 
+  [Steve Streeting][sinbad] for the original coding.
+
+* Bugfix: git_current_branch fails for git prior 1.7.10.  
+  git symbolic-ref does not have the --short option prior to version 1.7.10.
+  Bug found by [Daniel Dehennin][baby-gnu].
+
+* Clean up code.  
+  Remove all porcelain commands.    
+  Refactor code.
+
+* Improve the back-merge functionality.  
+  Adds an command line option (-b), which the user can utilize if the user
+  doesn't want to back-merge but rather merge the release branch into
+  develop.
+
+* Add the sub-action delete to sub-commands feature, release and hotfix.    
+  The sub-commands feature, release and hotfix now have a new sub-action, 
+  delete. With that action you can delete the branches, locally and remote.
+  The action has two options, -f and -r. With -f you can force the deletion,
+  even when the to be deleted branch was not merged yet. With -r the remote 
+  branch will also be deleted.
+
+[Daniel Dehennin][baby-gnu]
+* Bugfix: release/feature/hotfix start -F fails.  
+  Usage of positional parameters requires to eval ${FLAGS_ARGV}. The "eval set" 
+  in function call does not propagate to the caller.
+
+* Accept tags as base for hotfix/release/support start.  
+  Commit pointed by tags are reachable with ^0\[1\].
+
+* Check for parameter existence for branch and tag existence helpers.
+
+* Do not finish hotfixes if they have no commits.  
+  A hotfix branch must have some commits and be ahead of master.
+
+* Bugfix: When running git flow version an error message pops up.
+
+* Reorder fetch and sanity checks.  
+  When a user requests a fetch for git flow {feature|hotfix|support} start, do 
+  this before some sanity checks to avoid any conflict in branch names 
+  and/or version.
+
+* Fix flag test in cmd_delete().
+
+[Myke Hines][mykehsd]
+* Feature and Release squashing options.  
+  This allows a -S option to both feature and releasing finishing actions so 
+  that developers can squash commits into one large one.
+
+[Peter Ragone][pcragone]
+* Add init to git-flow-{feature,release,hotfix,support}.   
+  Fixes the relatively minor issue where 'git flow subcommand help' 
+  gives "Not a gitflow-enabled repo yet".
+
+* Special thanks to the following individual:    
+  [Gert Van Gool][gvangool]
+
 #### 1.0-avh
-
 [Peter van der Does][petervanderdoes]
 
 * Remove trailing whitespace.
-* Updated from latest develop branch from nvie.  
+
+* Updated from latest develop branch from nvie.    
   Some features were still missing.
+
 * Remove the submodule shFlags.  
   Instead of the submodule we'll just use the file.
+
 * When finishing a release or hotfix, use tag for back-merging if available.    
   When a release or hotfix branch is tagged, the tag is never merged into the
   develop branch, it is preferable to have the tag in the develop branch as
   well, for use with git describe for example.
+
 * Update license info.
+
 * Bugfix: Typo when pulling existing feature from remote.Thanks to [John Harrison][bloomonkey],  [Miltos][mallamanis], [Kostas][kperi] and [memleak][memleak].
+
 * Wrong variable names in the bare-bones.  
   The wrong variable name is set, this can lead to confusing on what's 
   passed to the script,
@@ -36,20 +130,20 @@
   leads to all sorts of other problems.
 
 #### 0.4.2-avh1
-
 [Peter van der Does][petervanderdoes]
 
 * Start of the git flow AVH release.
+
 * Adds support for the version filter in the commands `git flow release start`
 and `git flow hotfix start`
+
 * Adds support for hooks in various commands.
 
 [Ben Loveridge][bloveridge]
 
 * Fix usage of shFlags on FreeBSD
 
 #### 0.4.2
-
 Release date: not yet
 
 * `git flow init` now detects situations where origin already has gitflow
@@ -70,7 +164,6 @@ Release date: not yet
 * Add package installer for the Windows platform.
 
 #### 0.4.1
-
 Release date: **2011/02/04**
 
 * New option `-d` added to `git flow init`, to initialize with defaults without
@@ -84,7 +177,6 @@ Release date: **2011/02/04**
 
 
 #### 0.4
-
 Release date: **2010/10/18**
 
 * The flag parsing issues of git-flow subcommands are solved for most
@@ -102,7 +194,6 @@ Release date: **2010/10/18**
 
 
 #### 0.3
-
 Release date: **2010/07/22**
 
 * New subcommands for `git flow feature`:

LICENSE

@@ -1,4 +1,4 @@
-This software is forked of the original gitflow, see License #2.
+This software is forked of the original git-flow, see License #2.
 License #1 is added to reflect the changes made.
 
 gitflow-shFlags is released under LGPL, see License #3 and #4

README.mdown

@@ -108,11 +108,12 @@ The ``-d`` flag will accept all defaults.
 
 ### Creating feature/release/hotfix/support branches
 
-* To list/start/finish feature branches, use:
+* To list/start/finish/delete feature branches, use:
 
   		git flow feature
   		git flow feature start <name> [<base>]
   		git flow feature finish <name>
+  		git flow feature delete <name>
 
   For feature branches, the `<base>` arg must be a commit on `develop`.
 
@@ -121,19 +122,21 @@ The ``-d`` flag will accept all defaults.
   		git flow feature publish <name>
 		git flow feature pull <remote> <name>
 
-* To list/start/finish release branches, use:
+* To list/start/finish/delete release branches, use:
 
   		git flow release
   		git flow release start <release> [<base>]
   		git flow release finish <release>
+  		git flow release delete <release>
 
   For release branches, the `<base>` arg must be a commit on `develop`.
 
-* To list/start/finish hotfix branches, use:
+* To list/start/finish/delete hotfix branches, use:
 
   		git flow hotfix
   		git flow hotfix start <release> [<base>]
   		git flow hotfix finish <release>
+  		git flow hotfix delete <release>
 
   For hotfix branches, the `<base>` arg must be a commit on `master`.
 

contrib/gitflow-installer.sh

@@ -32,7 +32,7 @@ SCRIPT_FILES="git-flow-init git-flow-feature git-flow-hotfix git-flow-release gi
 HOOK_FILES="$REPO_NAME/hooks/*"
 
 
-echo "### gitflow no-make installer ###"
+echo "### git-flow no-make installer ###"
 
 case "$1" in
 	uninstall)

git-flow

@@ -109,6 +109,12 @@ main() {
 	fi
 
 	# Run the specified action
+	if [ $SUBACTION != "help" ] && [ $SUBCOMMAND != "init" ] && [ $SUBCOMMAND != "version" ]; then
+		init
+  	fi
+  	if [ $SUBACTION != 'default' ]; then
+  		FLAGS_PARENT="git flow $SUBCOMMAND $SUBACTION"
+  	fi
 	cmd_$SUBACTION "$@"
 }