Invisible file remove during merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 --full-history

I prepared a sample repository that exhibits a behavior I was not expecting:

https://github.com/alvarezp/invisible-remove-git-demo

Am I missing some option?

Thanks.




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]