diff options
author | Johan Herland <johan@herland.net> | 2010-06-04 01:17:33 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-06 10:16:30 -0700 |
commit | f70d0586d68c41304e7ff95c7fa2a06b74896e77 (patch) | |
tree | a636c286a2eb28dfd71e39cd253cc4cb46a00ff5 /Documentation | |
parent | revision: --ancestry-path (diff) | |
download | tgif-f70d0586d68c41304e7ff95c7fa2a06b74896e77.tar.xz |
Documentation/rev-list-options.txt: Fix missing line in example history graph
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | 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 b9fb7a86bd..81815e1c32 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 ----------------------------------------------------------------------- + |