git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Bracey <kevin@bracey.fi>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Kevin Bracey <kevin@bracey.fi>
Subject: [PATCH v3 4/9] rev-list-options.txt: correct TREESAME for P
Date: Sun,  5 May 2013 18:32:52 +0300	[thread overview]
Message-ID: <1367767977-14513-5-git-send-email-kevin@bracey.fi> (raw)
In-Reply-To: <1367767977-14513-1-git-send-email-kevin@bracey.fi>

In the example given, P is not TREESAME to E. This doesn't affect the
current result, but it will matter when we change behaviour.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
---
 Documentation/rev-list-options.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 3bdbf5e..50bbff7 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -367,8 +367,7 @@ each merge.  The commits are:
   `N` and `D` to "foobarbaz"; i.e., it is not TREESAME to any parent.
 
 * `E` changes `quux` to "xyzzy", and its merge `P` combines the
-  strings to "quux xyzzy".  Despite appearing interesting, `P` is
-  TREESAME to all parents.
+  strings to "quux xyzzy".  `P` is TREESAME to `O`, but not to `E`.
 
 'rev-list' walks backwards through history, including or excluding
 commits based on whether '\--full-history' and/or parent rewriting
-- 
1.8.3.rc0.28.g682c2d9

  parent reply	other threads:[~2013-05-05 15:39 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-05 15:32 [PATCH v3 0/9] History traversal refinements Kevin Bracey
2013-05-05 15:32 ` [PATCH v3 1/9] decorate.c: compact table when growing Kevin Bracey
2013-05-05 15:32 ` [PATCH v3 2/9] t6019: test file dropped in -s ours merge Kevin Bracey
2013-05-05 15:32 ` [PATCH v3 3/9] t6111: new TREESAME test set Kevin Bracey
2013-05-06 19:37   ` Junio C Hamano
2013-05-06 20:36   ` Junio C Hamano
2013-05-07 15:19     ` Kevin Bracey
2013-05-07 16:28       ` Junio C Hamano
2013-05-05 15:32 ` Kevin Bracey [this message]
2013-05-05 15:32 ` [PATCH v3 5/9] revision.c: Make --full-history consider more merges Kevin Bracey
2013-05-06 20:45   ` Junio C Hamano
2013-05-07 14:46     ` Kevin Bracey
2013-05-07 15:21       ` Junio C Hamano
2013-05-05 15:32 ` [PATCH v3 6/9] t6012: update test for tweaked full-history traversal Kevin Bracey
2013-05-05 15:32 ` [PATCH v3 7/9] simplify-merges: never remove all TREESAME parents Kevin Bracey
2013-05-05 15:32 ` [PATCH v3 8/9] simplify-merges: drop merge from irrelevant side branch Kevin Bracey
2013-05-05 15:32 ` [PATCH v3 9/9] revision.c: discount side branches when computing TREESAME Kevin Bracey
2013-05-06 16:51 ` [PATCH v3 10/9] revision.c: treat A...B merge bases as if manually specified Kevin Bracey
2013-05-06 21:24   ` Junio C Hamano
2013-05-07 15:52     ` Kevin Bracey

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=1367767977-14513-5-git-send-email-kevin@bracey.fi \
    --to=kevin@bracey.fi \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=torvalds@linux-foundation.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).