Documentation: describe new cherry-pick --ff option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
b5c1a28b4c
commit
ab7e63e85f
@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
|
|||||||
|
|
||||||
SYNOPSIS
|
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
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
@ -70,6 +70,10 @@ effect to your index in a row.
|
|||||||
--signoff::
|
--signoff::
|
||||||
Add Signed-off-by line at the end of the commit message.
|
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
|
Author
|
||||||
------
|
------
|
||||||
|
Reference in New Issue
Block a user