summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-01 18:04:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-01 22:14:38 (GMT)
commit3add01bbf14c5f2cb94523ee638c22c8157f0d2b (patch)
treecea90fd743eacbd41e5709dde1b30df3e1e969c6
parentf98fd4367542b507c18b6aeb4ac0c824dec4b7b3 (diff)
downloadgit-3add01bbf14c5f2cb94523ee638c22c8157f0d2b.zip
git-3add01bbf14c5f2cb94523ee638c22c8157f0d2b.tar.gz
git-3add01bbf14c5f2cb94523ee638c22c8157f0d2b.tar.bz2
"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>
-rw-r--r--Documentation/rev-list-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 09860de..a9de9a7 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.