summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorWink Saville <wink@saville.com>2018-03-23 14:25:26 -0700
committerJunio C Hamano <gitster@pobox.com>2018-03-23 15:28:06 -0700
commit950b487cf06672c60ab5080bf5b6a59bd394457d (patch)
tree25fe46a362a104e4796ed8c652e28452a06d3837 /git-rebase.sh
parent27c499bf33bf6c03cd8c9cfeaa0985f8f7dafc25 (diff)
downloadgit-950b487cf06672c60ab5080bf5b6a59bd394457d.tar.gz
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 6edf8c5b19..fb64ee1fe4 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -197,7 +197,7 @@ run_specific_rebase () {
autosquash=
fi
. git-rebase--$type
- git_rebase__$type
+ git_rebase__$type${preserve_merges:+__preserve_merges}
ret=$?
if test $ret -eq 0
then