diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-29 04:52:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-29 04:52:28 (GMT) |
| commit | 99f5b0845ac53f9f6e845fe4401e68fcef154690 (patch) | |
| tree | 5647dacc82fa90cb8de24ec4f4b9abea249707cf /Documentation | |
| parent | 3b37d9c17efd199a237435f7d8573008f6aa68c1 (diff) | |
| parent | 28db756feead84929cdfaaee8bccd301384daab4 (diff) | |
| download | git-99f5b0845ac53f9f6e845fe4401e68fcef154690.zip git-99f5b0845ac53f9f6e845fe4401e68fcef154690.tar.gz git-99f5b0845ac53f9f6e845fe4401e68fcef154690.tar.bz2 | |
Merge branch 'cc/cherry-pick-ff'
* cc/cherry-pick-ff:
revert: fix tiny memory leak in cherry-pick --ff
rebase -i: use new --ff cherry-pick option
Documentation: describe new cherry-pick --ff option
cherry-pick: add tests for new --ff option
revert: add --ff option to allow fast forward when cherry-picking
builtin/merge: make checkout_fast_forward() non static
parse-options: add parse_options_concat() to concat options
Diffstat (limited to 'Documentation')
| -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 78f4714..d71607a 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 ------ |