diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:04 +0300 |
| commit | c5aa4bccb5ffcc01e45915c00d2fce30ce959dab (patch) | |
| tree | 1416c16d013f318821cff23d71ea2dba6c866dbe /diff.c | |
| parent | 89be19d7080721dab5f07488b7987c66c8b8460c (diff) | |
| parent | 8fa6eea0ffd271f0564048dc939987e9640efca5 (diff) | |
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 'diff.c')
0 files changed, 0 insertions, 0 deletions