From: Johan Herland <johan@herland.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, johan@herland.net,
Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH 1/5] Documentation/rev-list-options.txt: Fix missing line in example history graph
Date: Fri, 04 Jun 2010 01:17:33 +0200 [thread overview]
Message-ID: <1275607057-26645-2-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1275607057-26645-1-git-send-email-johan@herland.net>
In the detailed explanation of how the revision machinery does history
simplification, the current text presents an example history and explains
how various options of the revision machinery affect the resulting list
of commits. The first simplification mode mentioned is the default mode,
in which a number of commits is omitted from the example graph according
to the history simplification rules. The text states (among other things)
that commit "C was considered via N, but is TREESAME", and therefore
omitted. However, the accompanying graph does not list the effect on the
implicit parentage, i.e. that commit I takes C's place as a parent of N.
Running 'git rev-list --parents P' does indeed list I as a second parent
of N, and the accompanying graph should therefore also show this line.
Signed-off-by: Johan Herland <johan@herland.net>
Cc: Thomas Rast <trast@student.ethz.ch>
---
Documentation/rev-list-options.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index b9fb7a8..81815e1 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -440,7 +440,7 @@ This results in:
+
-----------------------------------------------------------------------
.-A---N---O
- / /
+ / / /
I---------D
-----------------------------------------------------------------------
+
--
1.7.0.4
next prev parent reply other threads:[~2010-06-03 23:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-03 23:17 [PATCH 0/5] revision: --ancestry-path, take 2 Johan Herland
2010-06-03 23:17 ` Johan Herland [this message]
2010-06-03 23:17 ` [PATCH 2/5] revision: --ancestry-path Johan Herland
2010-06-03 23:17 ` [PATCH 3/5] Documentation/rev-list-options.txt: Explain --ancestry-path Johan Herland
2010-06-03 23:17 ` [PATCH 4/5] revision: Fix typo in --ancestry-path error message Johan Herland
2010-06-03 23:17 ` [PATCH 5/5] revision: Turn off history simplification in --ancestry-path mode Johan Herland
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=1275607057-26645-2-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).