git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Octavio Alvarez <alvarezp@alvarezp.ods.org>
To: git@vger.kernel.org
Subject: Invisible file remove during merge
Date: Mon, 10 Oct 2016 18:04:26 -0700	[thread overview]
Message-ID: <d7e42701-363b-70a4-8eb0-da4715cd9ba5@alvarezp.ods.org> (raw)

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.


             reply	other threads:[~2016-10-11  1:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-11  1:04 Octavio Alvarez [this message]
2016-10-11  2:42 ` Invisible file remove during merge Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d7e42701-363b-70a4-8eb0-da4715cd9ba5@alvarezp.ods.org \
    --to=alvarezp@alvarezp.ods.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).