Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: avoid triggering add_cacheinfo error with dirty mod
[gitweb.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index a1f6e5de6a3ed1fe9a6217a136611682f3db6582..fb64ee1fe42e801a57f1709c15617ddbc27f05af 100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-197,6
+197,7
@@
run_specific_rebase () {
autosquash=
fi
. git-rebase--$type
+ git_rebase__$type${preserve_merges:+__preserve_merges}
ret=$?
if test $ret -eq 0
then