diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
tree | 390507328a7564b65dc803683c34235700b97409 /git-cherry.txt | |
parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-cherry.txt')
-rw-r--r-- | git-cherry.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cherry.txt b/git-cherry.txt index 9859bc8f2..d761a7342 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -14,7 +14,7 @@ DESCRIPTION The changeset (or "diff") of each commit between the fork-point and <head> is compared against each commit between the fork-point and <upstream>. 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 <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have @@ -37,8 +37,8 @@ to and including <limit> are not reported: \__*__*__<limit>__-__+__> <head> -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 <upstream> under a different commit id. For example, this will happen if you're feeding patches <upstream> via email rather than pushing or pulling commits directly. |