From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Apr 2011 18:04:46 +0000 (-0700)
Subject: "log --cherry-pick" documentation regression fix
X-Git-Tag: v1.7.5-rc1~6^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3add01bbf14c5f2cb94523ee638c22c8157f0d2b;p=git.git

"log --cherry-pick" documentation regression fix

Earlier f98fd43 (git-log.txt,rev-list-options.txt: put option blocks in
proper order, 2011-03-08) moved the text around in the documentation for
options in the rev-list family of commands such as "log".  Consequently,
the description of the --cherry-pick option appears way above the
description of the --left-right option now.

But the description of the --cherry-pick option still refers to the
example for the --left-right option, like this:

    ... with --left-right, like the example ABOVE in the description of
    that option.

Rephrase it to clarify that we are making a forward reference.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 09860de9c..a9de9a74d 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -159,8 +159,8 @@ endif::git-rev-list[]
 +
 For example, if you have two branches, `A` and `B`, a usual way
 to list all commits on only one side of them is with
-`--left-right`, like the example above in the description of
-that option.  It however shows the commits that were cherry-picked
+`--left-right` (see the example below in the description of
+the `--left-right` option).  It however shows the commits that were cherry-picked
 from the other branch (for example, "3rd on b" may be cherry-picked
 from branch A).  With this option, such pairs of commits are
 excluded from the output.