git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Invisible file remove during merge

From
OAOctavio Alvarez <alvarezp@alvarezp.ods.org>
Date
Oct 11, 2016, 01:04 UTC
Message-ID
<d7e42701-363b-70a4-8eb0-da4715cd9ba5@alvarezp.ods.org>
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.
Next: Jeff King
Message 1 of 2 in “Invisible file remove during merge”
  1. Octavio AlvarezOct 11, 2016
  2. Jeff KingOct 11, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.