diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-04-25 14:29:29 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 12:28:43 +0900 |
commit | 537e7d61359233e95d2ca6ef6b9059afca8daa81 (patch) | |
tree | 79414a94828c3d321ddd2bd6b2d19ef7d0e242e1 /Documentation/RelNotes/2.11.3.txt | |
parent | sequencer: make refs generated by the `label` command worktree-local (diff) | |
download | tgif-537e7d61359233e95d2ca6ef6b9059afca8daa81.tar.xz |
sequencer: handle post-rewrite for merge commands
In the previous patches, we implemented the basic functionality of the
`git rebase -i --rebase-merges` command, in particular the `merge`
command to create merge commits in the sequencer.
The interactive rebase is a lot more these days, though, than a simple
cherry-pick in a loop. For example, it calls the post-rewrite hook (if
any) after rebasing with a mapping of the old->new commits.
This patch implements the post-rewrite handling for the `merge` command
we just introduced. The other commands that were added recently (`label`
and `reset`) do not create new commits, therefore post-rewrite hooks do
not need to handle them.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.11.3.txt')
0 files changed, 0 insertions, 0 deletions