Skip to content

Commit

Permalink
Merge branch 'jc/rev-list-options-fix' into maint
Browse files Browse the repository at this point in the history
* jc/rev-list-options-fix:
  "log --cherry-pick" documentation regression fix
  • Loading branch information
Junio C Hamano committed Apr 13, 2011
2 parents 302de7a + 3add01b commit 06ff449
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/rev-list-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 06ff449

Please sign in to comment.