X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=27b67b81a58956c48452b7aee46b9742ca02e31a;hb=e52775f43857f377aa2aa69f82ac2d2f26dc6297;hp=14d0bd51cd6ea23696b8b60d4e804440f408ce1e;hpb=7fc9d69fca0ea8afab6709622b694f31662fb2ee;p=git.git diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 14d0bd51c..27b67b81a 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -3,26 +3,55 @@ git-cherry(1) NAME ---- -git-cherry - Some git command not yet documented. - +git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git-cherry' [ --option ] ... +'git-cherry' [-v] [] [] DESCRIPTION ----------- -Does something not yet documented. +The changeset (or "diff") of each commit between the fork-point and +is compared against each commit between the fork-point and . + +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: + + __*__*__*__*__> + / + 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 +has been applied under a different commit id. For example, +this will happen if you're feeding patches via email rather +than pushing or pulling commits directly. OPTIONS ------- ---option:: - Some option not yet documented. +-v:: + Verbose. -...:: - Some argument not yet documented. +:: + Upstream branch to compare against. +:: + Working branch; defaults to HEAD. Author ------ @@ -34,5 +63,5 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite