From: Junio C Hamano Date: Tue, 10 Apr 2007 22:28:32 +0000 (-0700) Subject: Documentation: --cherry-pick X-Git-Tag: v1.5.2-rc0~56^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=55a643ed1b9b9af4d3bd9dc934dfccd142d1c632;p=git.git Documentation: --cherry-pick Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 12b71ed0b..77e068b15 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -22,6 +22,7 @@ SYNOPSIS [ \--topo-order ] [ \--parents ] [ \--left-right ] + [ \--cherry-pick ] [ \--encoding[=] ] [ \--(author|committer|grep)= ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] @@ -224,6 +225,20 @@ limiting may be applied. In addition to the '' listed on the command line, read them from the standard input. +--cherry-pick:: + + Omit any commit that introduces the same change as + another commit on the "other side" when the set of + commits are limited with symmetric difference. ++ +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 +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. + -g, --walk-reflogs:: Instead of walking the commit ancestry chain, walk