From: Andreas Schwab <schwab@linux-m68k.org>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: "Christof Krüger" <git@christof-krueger.de>, git@vger.kernel.org
Subject: Re: Deleted file is back - how to investigate?
Date: Sun, 26 Jun 2011 22:57:31 +0200 [thread overview]
Message-ID: <m2iprsxqdg.fsf@igel.home> (raw)
In-Reply-To: <20110626202532.GS30255@genesis.frugalware.org> (Miklos Vajna's message of "Sun, 26 Jun 2011 22:25:32 +0200")
Miklos Vajna <vmiklos@frugalware.org> writes:
> Great, --graph indeed lists two merge commits, and if I check the tree
> objects manually, I can see which one introduced the file. But I still
> don't really understand --name-status why don't show the addition of
> those files, given that I hoped this counts as an "evil merge".
The file is unchanged wrt. to the first parent, so it is
"uninteresting".
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-06-26 21:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-26 10:32 Deleted file is back - how to investigate? Miklos Vajna
2011-06-26 14:10 ` Christof Krüger
2011-06-26 20:25 ` Miklos Vajna
2011-06-26 20:57 ` Andreas Schwab [this message]
2011-06-26 21:12 ` Christof Krüger
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2iprsxqdg.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@christof-krueger.de \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox