diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-12 15:26:01 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-13 12:04:00 +0900 |
| commit | 5aec9271d343f117eb075a2b7038481f0d9f276f (patch) | |
| tree | 3bfe174fdc8d5d43da2aca046de47cde727f26c4 /Documentation/gittutorial.txt | |
| parent | rebase -i: include MERGE_HEAD into files to clean up (diff) | |
| download | tgif-5aec9271d343f117eb075a2b7038481f0d9f276f.tar.xz | |
built-in rebase --skip/--abort: clean up stale .git/<name> files
The scripted version of the rebase used to execute `git reset --hard`
when skipping or aborting. When we ported this to C, we did update the
worktree and some reflogs, but we failed to imitate `git reset --hard`'s
behavior regarding files in .git/ such as MERGE_HEAD.
Let's address this oversight.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gittutorial.txt')
0 files changed, 0 insertions, 0 deletions