diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:04 +0900 |
| commit | c5aa4bccb5ffcc01e45915c00d2fce30ce959dab (patch) | |
| tree | 1416c16d013f318821cff23d71ea2dba6c866dbe /git-rebase--interactive.sh | |
| parent | Merge branch 'dd/send-email-reedit' (diff) | |
| parent | rebase --rebase-merges: root commits can be cousins, too (diff) | |
| download | git-c5aa4bccb5ffcc01e45915c00d2fce30ce959dab.tar.gz git-c5aa4bccb5ffcc01e45915c00d2fce30ce959dab.zip | |
Merge branch 'js/sequencer-and-root-commits'
The implementation of "git rebase -i --root" has been updated to use
the sequencer machinery more.
* js/sequencer-and-root-commits:
rebase --rebase-merges: root commits can be cousins, too
rebase --rebase-merges: a "merge" into a new root is a fast-forward
sequencer: allow introducing new root commits
rebase -i --root: let the sequencer handle even the initial part
sequencer: learn about the special "fake root commit" handling
sequencer: extract helper to update active_cache_tree
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index cbf44f8648..2f4941d0fc 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -894,6 +894,8 @@ init_revisions_and_shortrevisions () { else revisions=$onto...$orig_head shortrevisions=$shorthead + test -z "$squash_onto" || + echo "$squash_onto" >"$state_dir"/squash-onto fi } @@ -948,7 +950,7 @@ EOF die "Could not skip unnecessary pick commands" checkout_onto - if test -z "$rebase_root" && test ! -d "$rewritten" + if test ! -d "$rewritten" then require_clean_work_tree "rebase" exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \ |