summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsean <seanlkml@sympatico.ca>2006-05-05 19:06:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-05 21:23:08 (GMT)
commit81ae43cdc4ec4bfba1638aa9786e08322d10b72c (patch)
tree22e0b25f976f73c39ad5a2a2e7419246382e9308
parentae0b219c8e32aa8f34401252d845916b136a467b (diff)
downloadgit-81ae43cdc4ec4bfba1638aa9786e08322d10b72c.zip
git-81ae43cdc4ec4bfba1638aa9786e08322d10b72c.tar.gz
git-81ae43cdc4ec4bfba1638aa9786e08322d10b72c.tar.bz2
Clarify git-cherry documentation.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-cherry.txt19
1 files changed, 14 insertions, 5 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 9a5e371..893baaa 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -11,11 +11,20 @@ SYNOPSIS
DESCRIPTION
-----------
-Each commit between the fork-point and <head> is examined, and compared against
-the change each commit between the fork-point and <upstream> 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 <head>
+is compared against each commit between the fork-point and <upstream>.
+
+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 <upstream> branch are prefixed with a minus (-) sign, and those
+that only exist in the <head> 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 <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.
+
OPTIONS
-------