X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=74d14c4e7fc88e702e4781b22eb8ed5ce0480c6f;hb=0f7a8f2dba5aeb8ce8ab4a710a1d1310705f7f08;hp=b0468aa746a074741de8b4a4ebeb82c177edb1e8;hpb=891e85a0c08e12d3f6174d8eb10b4ef284c4b01b;p=git.git diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index b0468aa74..74d14c4e7 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -7,12 +7,14 @@ git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git-cherry' [-v] [] [] +'git cherry' [-v] [] [] DESCRIPTION ----------- The changeset (or "diff") of each commit between the fork-point and is compared against each commit between the fork-point and . +The commits are compared with their 'patch id', obtained from +the 'git-patch-id' program. Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have @@ -35,8 +37,8 @@ to and including are not reported: \__*__*____-__+__> -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 +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. @@ -56,9 +58,13 @@ OPTIONS :: Do not report commits up to (and including) limit. +SEE ALSO +-------- +linkgit:git-patch-id[1] + Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation -------------- @@ -66,4 +72,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite