rebase: add and use git_rebase__interactive__preserve_merges
authorWink Saville <wink@saville.com>
Fri, 23 Mar 2018 21:25:26 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2018 22:28:06 +0000 (15:28 -0700)
commit950b487cf06672c60ab5080bf5b6a59bd394457d
tree25fe46a362a104e4796ed8c652e28452a06d3837
parent27c499bf33bf6c03cd8c9cfeaa0985f8f7dafc25
rebase: add and use git_rebase__interactive__preserve_merges

At the moment it's an exact copy of git_rebase__interactive except
the name has changed.

Signed-off-by: Wink Saville <wink@saville.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh
git-rebase.sh