diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-02-23 13:39:07 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-23 11:30:52 -0800 |
commit | 6f283c2e9df856941f40273cbf5fe695a8ec665c (patch) | |
tree | f9b5dfd3c10f40d970c37f5a5fccdb0313e133fc /commit.c | |
parent | 86afa8ff8631dc630ce01bdfbe4eb44450454f42 (diff) | |
download | git-6f283c2e9df856941f40273cbf5fe695a8ec665c.tar.gz |
sequencer: handle post-rewrite for merge commands
In the previous patches, we implemented the basic functionality of the
`git rebase -i --recreate-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 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 'commit.c')
0 files changed, 0 insertions, 0 deletions