From: Junio C Hamano <junkio@cox.net>
To: Paul Mackerras <paulus@samba.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Do 3-way diff between HEAD, index and working directory
Date: Mon, 04 Sep 2006 15:23:16 -0700 [thread overview]
Message-ID: <7vpsebl19n.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 17660.4160.642852.177249@cargo.ozlabs.ibm.com
Paul Mackerras <paulus@samba.org> writes:
> This implements a 3-way diff between the HEAD commit, the state in the
> index, and the working directory. This is like the n-way diff for a
> merge, and uses much of the same code. It is invoked with the -c flag
> to git-diff-index, which it already accepted and did nothing with.
>
> Signed-off-by: Paul Mackerras <paulus@samba.org>
> ---
> Junio, does this look right?
Seems correct from a cursory look. This also seems to change
the behaviour for an unmerged entry case slightly but I think
it is for the better (depending on the definition of "better" --
some people may feel combined diff to be weird and confusing).
prev parent reply other threads:[~2006-09-04 22:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-04 11:38 [PATCH] Do 3-way diff between HEAD, index and working directory Paul Mackerras
2006-09-04 22:23 ` Junio C Hamano [this message]
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=7vpsebl19n.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=paulus@samba.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;
as well as URLs for NNTP newsgroup(s).