Merge branch 'release/1.10.1'

Author: petervanderdoes

AUTHORS

@@ -55,6 +55,7 @@ Leonardo Giordani
 Mark Borcherding
 Mark Derricutt
 Mateusz Kaczmarek
+Matias Hernan Lauriti
 Nowell Strite
 Opher Vishnia
 Peter Schröder

Changes.mdown

@@ -28,6 +28,10 @@
 
 # Changelog
 
+#### 1.10.1
+[Peter van der Does][petervanderdoes]
+* Bugfix: flag short name (p) already defined
+
 #### 1.10.0
 [Peter van der Does][petervanderdoes]
 * Update github links.

README.mdown

@@ -187,7 +187,7 @@ to get rid of the local feature that tracks a remote branch that no more exist.
 
 ### Using Hooks and Filters
 
-For a wide variety of commands hooks or filters can called before and after
+For a wide variety of commands hooks or filters can be called before and after
 the command.  
 The files should be placed in .git/hooks  
 In the directory hooks you can find examples of all the hooks available.

git-flow-feature

@@ -258,7 +258,7 @@ no-ff!                 Never fast-forward during the merge
 	DEFINE_boolean 'fetch' false "fetch from $ORIGIN before performing finish" F
 	DEFINE_boolean 'rebase' false "rebase before merging" r
 	DEFINE_boolean 'preserve-merges' false 'try to recreate merges while rebasing' p
-	DEFINE_boolean 'push' false "push to $ORIGIN after performing finish" p
+	DEFINE_boolean 'push' false "push to $ORIGIN after performing finish"
 	DEFINE_boolean 'keep' false "keep branch after performing finish" k
 	DEFINE_boolean 'keepremote' false "keep the remote branch"
 	DEFINE_boolean 'keeplocal' false "keep the local branch"

git-flow-version

@@ -35,7 +35,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-GITFLOW_VERSION=1.10.0
+GITFLOW_VERSION=1.10.1
 
 initialize() {
 	# A function can not be empty. Comments count as empty.