Merge branch 'maint'

* maint:
  Fix misleading wording for git-cherry-pick

Documentation/git-cherry-pick.txt

@@ -55,13 +55,12 @@ OPTIONS
 
 -n::
 --no-commit::
-	Usually the command automatically creates a commit with
+	Usually the command automatically creates a commit.
-	a commit log message stating which commit was
+	This flag applies the change necessary to cherry-pick
-	cherry-picked.  This flag applies the change necessary
+	the named commit to your working tree and the index,
-	to cherry-pick the named commit to your working tree
+	but does not make the commit.  In addition, when this
-	and the index, but does not make the commit.  In addition,
+	option is used, your index does not have to match the
-	when this option is used, your index does not have to match
+	HEAD commit.  The cherry-pick is done against the
-	the HEAD commit.  The cherry-pick is done against the
 	beginning state of your index.
 +
 This is useful when cherry-picking more than one commits'