summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2018-03-20 11:10:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-29 18:09:03 (GMT)
commitda27a6fbd50861149b32cfd1f9e5c36a935c575a (patch)
tree4a98aa0527d270cd9b096ef18e8db2931daf7c68 /setup.c
parentb79966aa386fc58801e93496cd4e97d82acd53a5 (diff)
downloadgit-da27a6fbd50861149b32cfd1f9e5c36a935c575a.zip
git-da27a6fbd50861149b32cfd1f9e5c36a935c575a.tar.gz
git-da27a6fbd50861149b32cfd1f9e5c36a935c575a.tar.bz2
rebase --keep-empty: always use interactive rebase
rebase --merge accepts --keep-empty but just ignores it, by using an implicit interactive rebase the user still gets the rename detection of a merge based rebase but with with --keep-empty support. If rebase --keep-empty without --interactive or --merge stops for the user to resolve merge conflicts then 'git rebase --continue' will fail. This is because it uses a different code path that does not create $git_dir/rebase-apply. As rebase --keep-empty was implemented using cherry-pick it has never supported the am options and now that interactive rebases support --signoff there is no loss of functionality by using an implicit interactive rebase. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
0 files changed, 0 insertions, 0 deletions