X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=27b67b81a58956c48452b7aee46b9742ca02e31a;hb=ce4231ffa80da1888a668cc7c33f5349800ab4a3;hp=9ff7bc25c1e8ccdf8204414536ad4373bd868b89;hpb=52a22d1e726f91b0ba4ea0afb7cfbfaaf624127b;p=git.git diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 9ff7bc25c..27b67b81a 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -3,19 +3,44 @@ git-cherry(1) NAME ---- -git-cherry - Find commits not merged upstream. +git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git-cherry' [-v] [] +'git-cherry' [-v] [] [] DESCRIPTION ----------- -Each commit between the fork-point and is examined, and compared against -the change each commit between the fork-point and introduces. -Commits already included in upstream are prefixed with '-' (meaning "drop from -my local pull"), while commits missing from upstream are prefixed with '+' -(meaning "add to the updated upstream"). +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 ------- @@ -38,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