| commit | 4b83ce9f6772451d4582dc1f0891790acbdf4eb1 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 2 Jan 2017 15:27:53 +0000 (2 16:27 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jan 2017 22:57:30 +0000 (9 14:57 -0800) | ||
| tree | 1cfe57edc42d6279ddd3de2595a9d183e91e2259 | treesnapshot (tar.gz zip) |
| parent | 52865279ee1187a0f630779d2015587ae702b1f4 | commitdiff |
sequencer (rebase -i): update refs after a successful rebase
An interactive rebase operates on a detached HEAD (to keep the reflog
of the original branch relatively clean), and updates the branch only
at the end.
Now that the sequencer learns to perform interactive rebases, it also
needs to learn the trick to update the branch before removing the
directory containing the state of the interactive rebase.
We introduce a new head_ref variable in a wider scope than necessary at
the moment, to allow for a later patch that prints out "Successfully
rebased and updated <ref>".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
An interactive rebase operates on a detached HEAD (to keep the reflog
of the original branch relatively clean), and updates the branch only
at the end.
Now that the sequencer learns to perform interactive rebases, it also
needs to learn the trick to update the branch before removing the
directory containing the state of the interactive rebase.
We introduce a new head_ref variable in a wider scope than necessary at
the moment, to allow for a later patch that prints out "Successfully
rebased and updated <ref>".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory |