git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/5] Documentation/rev-list-options.txt: Fix missing line in example history graph

From
Johan Herland <johan@herland.net>
Date
Jun 3, 2010, 23:17 UTC
Message-ID
<1275607057-26645-2-git-send-email-johan@herland.net>
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
Previous: Johan HerlandNext: Johan Herland
Message 2 of 6 in “revision: --ancestry-path, take 2”
  1. 0/5 revision: --ancestry-path, take 2Johan Herland, Jun 3, 2010
  2. 1/5 Documentation/rev-list-options.txt: Fix missing line in example history graphJohan Herland, Jun 3, 2010
  3. 2/5 revision: --ancestry-pathJohan Herland, Jun 3, 2010
  4. 3/5 Documentation/rev-list-options.txt: Explain --ancestry-pathJohan Herland, Jun 3, 2010
  5. 4/5 revision: Fix typo in --ancestry-path error messageJohan Herland, Jun 3, 2010
  6. 5/5 revision: Turn off history simplification in --ancestry-path modeJohan Herland, Jun 3, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.