Documentation: describe new cherry-pick --ff option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Mar 6, 2010 at 21:34 UTC
ab7e63e85f2307447f8fc6679e1f355385881236
1 file changed
+5
-1
Documentation/git-cherry-pick.txt
+5
-1
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
7
8
SYNOPSIS
9
--------
10
-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit>
10
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>
11
12
DESCRIPTION
13
-----------
@@ -70,6 +70,10 @@ effect to your index in a row.
70
--signoff::
71
Add Signed-off-by line at the end of the commit message.
72
73
+--ff::
74
+ If the current HEAD is the same as the parent of the
75
+ cherry-pick'ed commit, then a fast forward to this commit will
76
+ be performed.
77
78
Author
79
------