aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-13 13:56:52 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-13 13:56:52 -0700
commit06ff44951a233c2e3dee4f072430ac68306f9bf0 (patch)
tree50a9e23a0e8be19336b60427a2e1ec0da8e01c28
parent302de7a685952cddd764bd3ccd427d0cd9e67fdf (diff)
parent3add01bbf14c5f2cb94523ee638c22c8157f0d2b (diff)
downloadgit-06ff44951a233c2e3dee4f072430ac68306f9bf0.tar.gz
git-06ff44951a233c2e3dee4f072430ac68306f9bf0.tar.xz
Merge branch 'jc/rev-list-options-fix' into maint
* jc/rev-list-options-fix: "log --cherry-pick" documentation regression fix
-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 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.