X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-cherry.txt;h=893baaa6f656616b2151c572450e037fabee7622;hb=3026402cbc60c003c4bc043368afc619e4d9b3cd;hp=9ff7bc25c1e8ccdf8204414536ad4373bd868b89;hpb=52a22d1e726f91b0ba4ea0afb7cfbfaaf624127b;p=git.git
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 9ff7bc25..893baaa6 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -3,7 +3,7 @@ git-cherry(1)
NAME
----
-git-cherry - Find commits not merged upstream.
+git-cherry - Find commits not merged upstream
SYNOPSIS
--------
@@ -11,11 +11,20 @@ SYNOPSIS
DESCRIPTION
-----------
-Each commit between the fork-point and
is examined, and compared against
-the change each commit between the fork-point and introduces.
-Commits already included in upstream are prefixed with '-' (meaning "drop from
-my local pull"), while commits missing from upstream are prefixed with '+'
-(meaning "add to the updated upstream").
+The changeset (or "diff") of each commit between the fork-point and
+is compared against each commit between the fork-point and .
+
+Every commit with a changeset that doesn't exist in the other branch
+has its id (sha1) reported, prefixed by a symbol. Those existing only
+in the branch are prefixed with a minus (-) sign, and those
+that only exist in the branch are prefixed with a plus (+) symbol.
+
+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.
+
OPTIONS
-------
@@ -38,5 +47,5 @@ Documentation by Junio C Hamano and the git-list .
GIT
---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite