]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 69c9220) | patch
built-in rebase --skip/--abort: clean up stale .git/<name> files
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 12 Nov 2018 23:26:01 +0000 (15:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 03:04:00 +0000 (12:04 +0900)
commit5aec9271d343f117eb075a2b7038481f0d9f276f
tree3bfe174fdc8d5d43da2aca046de47cde727f26c4tree | snapshot
parent69c92209d2c4d33a25ed79a62a2170c0ff2059e8commit | diff
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>
builtin/rebase.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.