diff options
author | Junio C Hamano <junkio@cox.net> | 2007-04-10 15:28:32 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-04-11 20:02:03 -0700 |
commit | 55a643ed1b9b9af4d3bd9dc934dfccd142d1c632 (patch) | |
tree | f4b84e062a29bd9333c0b8a8818326c4e4760333 /Documentation | |
parent | d7a17cad9798693dc31043aa4efcce0b207483b9 (diff) | |
download | git-55a643ed1b9b9af4d3bd9dc934dfccd142d1c632.tar.gz |
Documentation: --cherry-pick
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-rev-list.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 12b71ed0bb..77e068b15f 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[=<encoding>] ] [ \--(author|committer|grep)=<pattern> ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] @@ -224,6 +225,20 @@ limiting may be applied. In addition to the '<commit>' 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 |