diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 07:04:04 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 07:04:04 +0200 |
| commit | c5aa4bccb5ffcc01e45915c00d2fce30ce959dab (patch) | |
| tree | 1416c16d013f318821cff23d71ea2dba6c866dbe /sequencer.h | |
| parent | Merge branch 'dd/send-email-reedit' (diff) | |
| parent | rebase --rebase-merges: root commits can be cousins, too (diff) | |
| download | git-c5aa4bccb5ffcc01e45915c00d2fce30ce959dab.tar.xz 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 'sequencer.h')
| -rw-r--r-- | sequencer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index a800cb5755..c5787c6b56 100644 --- a/sequencer.h +++ b/sequencer.h @@ -48,6 +48,10 @@ struct replay_opts { struct strbuf current_fixups; int current_fixup_count; + /* placeholder commit for -i --root */ + struct object_id squash_onto; + int have_squash_onto; + /* Only used by REPLAY_NONE */ struct rev_info *revs; }; |