Re: Invisible file remove during merge

2016-10-10 Thread Jeff King
On Mon, Oct 10, 2016 at 06:04:26PM -0700, Octavio Alvarez wrote: > If I do a "git rm file" during conflict resolution, the removed file > (mysterious-file.txt) does not show up on "git log --stat" nor "git show > --patch" for the merge commit. "git log" does not do merge diffs by default; you nee

Invisible file remove during merge

2016-10-10 Thread Octavio Alvarez
Hi. If I do a "git rm file" during conflict resolution, the removed file (mysterious-file.txt) does not show up on "git log --stat" nor "git show --patch" for the merge commit. "git log --all --stat --follow -- mysterious-file.txt" only shows the commit where the file was added. I also tried --f