X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=74d14c4e7fc88e702e4781b22eb8ed5ce0480c6f;hb=392f1300911120fbaa4b77c737fe13e205726aca;hp=9859bc8f2f28ae0483d1760230aa7bae39c7b95c;hpb=bb1ab2db08f48add4236a5a9c08aa1a6aa4d5d48;p=git.git diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 9859bc8f2..74d14c4e7 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. @@ -64,7 +64,7 @@ linkgit:git-patch-id[1] Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation --------------