diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2010-03-06 23:34:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 10:58:47 +0300 |
| commit | ab7e63e85f2307447f8fc6679e1f355385881236 (patch) | |
| tree | 149fd5913538657422d312653aa4a0e66ba9a512 /Documentation/git-cherry-pick.txt | |
| parent | b5c1a28b4c7d7e1324fa3e88ae03801d4fe9f6bb (diff) | |
Documentation: describe new cherry-pick --ff option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 78f4714da0..d71607a85d 100644 --- 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 ----------- @@ -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 ------ |