mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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:
parent
b5c1a28b4c
commit
ab7e63e85f
|
@ -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
|
||||
-----------
|
||||
|
@ -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
|
||||
------
|
||||
|
|
Loading…
Reference in a new issue