X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=7deefdae8f995d843971f6beff24af8325b99f1f;hb=5c7eee03da32ac8ff5e91159670558b0d7fb9b1a;hp=912601160cffb3ff8d41509a73109d9ddd0a076d;hpb=438d2991eaa17549df67929cd4558d65840c37d7;p=git.git diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 912601160..7deefdae8 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -7,14 +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 linkgit:git-patch-id[1] -program. +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 @@ -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. @@ -51,6 +51,7 @@ OPTIONS :: Upstream branch to compare against. + Defaults to the first tracked remote branch, if available. :: Working branch; defaults to HEAD.