diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-12 15:25:59 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-13 12:04:00 +0900 |
| commit | 69c92209d2c4d33a25ed79a62a2170c0ff2059e8 (patch) | |
| tree | 4f314ef5c3c037cc5507879675c7fb421c5a9564 /t/t5100/info0014--scissors | |
| parent | rebase -r: do not write MERGE_HEAD unless needed (diff) | |
| download | tgif-69c92209d2c4d33a25ed79a62a2170c0ff2059e8.tar.xz | |
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>
Diffstat (limited to 't/t5100/info0014--scissors')
0 files changed, 0 insertions, 0 deletions