git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@uchicago.edu>
Cc: git@vger.kernel.org, David Greaves <david@dgreaves.com>
Subject: Re: [PATCH] bring description of git diff --cc up to date
Date: Tue, 22 Jul 2008 17:36:43 -0700	[thread overview]
Message-ID: <7vfxq1igh0.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <Pine.GSO.4.62.0807221812470.25746@harper.uchicago.edu> (Jonathan Nieder's message of "Tue, 22 Jul 2008 18:27:18 -0500 (CDT)")

Jonathan Nieder <jrnieder@uchicago.edu> writes:

> +	This flag implies the '-c' option and makes the patch output
> +	even more compact by omitting uninteresting hunks.  A hunk is
> +	considered uninteresting if the person merging had two versions
> +	to choose between among all of the parents and the result shows

Hmm, I am not a native speaker, but the above makes me confused into
thinking that even if there are 47 parent versions, it is Ok if I looked
at only two versions and picked from one of them -- the description does
not seem to make it clear that it is required that the other 45 agree with
one of the two I looked at and picked from.

    ... if the contents in the parents had only two variants and the merge
    result picked one of them without modification.

would be succinct enough, perhaps?

If we want to further elaborate, we could say something like:

    In a two-parent merge, by definition, there can only be two variants
    to choose from.  Even in a merge with more than two parents, if some
    parents share the same content, and all the other parents share
    another, same content, there are only two variants to choose from.

but I think that is too verbose...

  reply	other threads:[~2008-07-23  0:37 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-22 16:19 [PATCH] bring description of git diff --cc up to date Jonathan Nieder
2008-07-22 17:09 ` Junio C Hamano
2008-07-22 21:21   ` Junio C Hamano
2008-07-22 23:27     ` Jonathan Nieder
2008-07-23  0:36       ` Junio C Hamano [this message]
2008-07-23  3:55         ` Jonathan Nieder
2008-07-23 23:15           ` Junio C Hamano
2008-07-24  0:35             ` Jonathan Nieder
  -- strict thread matches above, loose matches on Subject: below --
2008-07-21 18:27 Jonathan Nieder
2008-07-22  6:41 ` Junio C Hamano

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=7vfxq1igh0.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=david@dgreaves.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@uchicago.edu \
    /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).