aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-04 10:55:38 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-04 10:55:38 -0700
commit2c320e71bfae3d2972d41680a04b78cbd42cb941 (patch)
treef5551a7493c4c1fbe00c5e01f30da0aca9a0fd34
parent1eb71bc0ec609c67b8a308f9267691144a48bffd (diff)
parent3add01bbf14c5f2cb94523ee638c22c8157f0d2b (diff)
downloadgit-2c320e71bfae3d2972d41680a04b78cbd42cb941.tar.gz
git-2c320e71bfae3d2972d41680a04b78cbd42cb941.tar.xz
Merge branch 'jc/rev-list-options-fix'
* 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 ea5c6c49b..73111bb05 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -179,8 +179,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.