Merge branch 'gh/maint-stash-show-error-message'

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index b764130d26eb750d2b5173dcc98366828e413046..d71607a85d03062c76f7d17d4fd8e8b4168a279d 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
 
 SYNOPSIS
 --------
-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit>
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>
 
 DESCRIPTION
 -----------
@@ -24,7 +24,7 @@ OPTIONS
 
 -e::
 --edit::
-       With this option, 'git-cherry-pick' will let you edit the commit
+       With this option, 'git cherry-pick' will let you edit the commit
        message prior to committing.
 
 -x::
@@ -70,6 +70,10 @@ effect to your index in a row.
 --signoff::
        Add Signed-off-by line at the end of the commit message.
 
+--ff::
+       If the current HEAD is the same as the parent of the
+       cherry-pick'ed commit, then a fast forward to this commit will
+       be performed.
 
 Author
 ------