| commit | 69c92209d2c4d33a25ed79a62a2170c0ff2059e8 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 12 Nov 2018 23:25:59 +0000 (12 15:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Nov 2018 03:04:00 +0000 (13 12:04 +0900) | ||
| tree | 4f314ef5c3c037cc5507879675c7fb421c5a9564 | treesnapshot (tar.gz zip) |
| parent | 85f8d9da2182690461e05034a4a697f766bb8eb1 | commitdiff |
rebase -i: include MERGE_HEAD into files to clean up
Every once in a while, the interactive rebase makes sure that no stale
files are lying around. These days, we need to include MERGE_HEAD into
that set of files, as the `merge` command will generate them.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Every once in a while, the interactive rebase makes sure that no stale
files are lying around. These days, we need to include MERGE_HEAD into
that set of files, as the `merge` command will generate them.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory |