diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-06 21:34:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-06 23:58:47 -0800 |
| commit | c62f6ec341b1a768be7c9adf84d07c5b3b113a81 (patch) | |
| tree | 27ea47d1117620fd39d1e1a2a80d64f861b6eb7a /t/t5515/refs.br-branches-default_branches-default | |
| parent | builtin/merge: make checkout_fast_forward() non static (diff) | |
| download | tgif-c62f6ec341b1a768be7c9adf84d07c5b3b113a81.tar.xz | |
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>
Diffstat (limited to 't/t5515/refs.br-branches-default_branches-default')
0 files changed, 0 insertions, 0 deletions