| commit | c62f6ec341b1a768be7c9adf84d07c5b3b113a81 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 6 Mar 2010 20:34:42 +0000 (6 21:34 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 7 Mar 2010 07:58:47 +0000 (6 23:58 -0800) | ||
| tree | 27ea47d1117620fd39d1e1a2a80d64f861b6eb7a | treesnapshot (tar.gz zip) |
| parent | cac42b266a5868fc54b2e54986fa2689676ec447 | commitdiff |
revert: add --ff option to allow fast forward when cherry-picking
As "git merge" fast forwards if possible, it seems sensible to
have such a feature for "git cherry-pick" too, especially as it
could be used in git-rebase--interactive.sh.
Maybe this option could be made the default in the long run, with
another --no-ff option to disable this default behavior, but that
could make some scripts backward incompatible and/or that would
require testing if some GIT_AUTHOR_* environment variables are
set. So we don't do that for now.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
As "git merge" fast forwards if possible, it seems sensible to
have such a feature for "git cherry-pick" too, especially as it
could be used in git-rebase--interactive.sh.
Maybe this option could be made the default in the long run, with
another --no-ff option to disable this default behavior, but that
could make some scripts backward incompatible and/or that would
require testing if some GIT_AUTHOR_* environment variables are
set. So we don't do that for now.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-revert.c | diffblobblamehistory |