Re: [PATCH 3/5] rebase -i: include MERGE_HEAD into files to clean up

2018-11-12 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > 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. > > Signe

[PATCH 3/5] rebase -i: include MERGE_HEAD into files to clean up

2018-11-12 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin 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 --- sequencer.c | 2 ++ 1 fil