Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: make refs generated by the `label` command worktree-local
[gitweb.git]
/
git-rebase--interactive.sh
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index acb4bfd3fc891d1c3803f669decb44396ae8a335..e29da6343392d59f1999c486137b12bbb50e7382 100644
(file)
--- a/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@
-970,6
+970,7
@@
git_rebase__interactive () {
init_revisions_and_shortrevisions
git rebase--helper --make-script ${keep_empty:+--keep-empty} \
+ ${rebase_merges:+--rebase-merges} \
$revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
die "$(gettext "Could not generate todo list")"