From: Junio C Hamano <gitster@pobox.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Confused about diff-tree --cc output
Date: Wed, 04 Feb 2009 13:56:19 -0800 [thread overview]
Message-ID: <7vk585n9x8.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <76718490902041313y44eeb99bya33513bc9818aeb0@mail.gmail.com> (Jay Soffian's message of "Wed, 4 Feb 2009 16:13:39 -0500")
Jay Soffian <jaysoffian@gmail.com> writes:
> My understanding of "git show <merge commit>" is that it should only
> show changes if the merge resulted in a conflict that needed to be
> touched up (ignoring the possibility of an evil merge). Yet git show
> on this commit shows this diff:
I think this is "more than two versions", in
http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15491
Nothing new to see here, I think.
next prev parent reply other threads:[~2009-02-04 21:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 21:13 Confused about diff-tree --cc output Jay Soffian
2009-02-04 21:56 ` Junio C Hamano [this message]
2009-02-05 3:49 ` Jay Soffian
2009-02-05 8:38 ` Junio C Hamano
2009-02-05 8:57 ` Jay Soffian
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=7vk585n9x8.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.