X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=fed115acd01a63801a647ae870357d4c2d59ea44;hb=7aba6185d55e06db3f3ef18daa63baf3821e5030;hp=7deefdae8f995d843971f6beff24af8325b99f1f;hpb=09236d80480c15f6da804e56a80c08d320475fb1;p=git.git diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 7deefdae8..fed115acd 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -14,7 +14,7 @@ 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. +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 @@ -37,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.