X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=27b67b81a58956c48452b7aee46b9742ca02e31a;hb=842aaf93238377976111fc801aaacbf8a491db33;hp=e1bf8ee255e531c1c790ec9f10815f3f972000f8;hpb=7756b1f1dc07fae9abab4126a687a2609dfbf009;p=git.git diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index e1bf8ee25..27b67b81a 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git-cherry' [-v] [] +'git-cherry' [-v] [] [] DESCRIPTION ----------- @@ -18,7 +18,22 @@ Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the branch are prefixed with a minus (-) sign, and those -that only exist in the branch are prefixed with a plus (+) symbol. +that only exist in the branch are prefixed with a plus (+) symbol: + + __*__*__*__*__> + / + fork-point + \__+__+__-__+__+__-__+__> + + +If a has been given then the commits along the branch up +to and including are not reported: + + __*__*__*__*__> + / + fork-point + \__*__*____-__+__> + Because git-cherry compares the changeset rather than the commit id (sha1), you can use git-cherry to find out if a commit you made locally