Clarify git-cherry documentation.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
sean committed
May 5, 2006 at 15:06 UTC
81ae43cdc4ec4bfba1638aa9786e08322d10b72c
1 file changed
+14
-5
Documentation/git-cherry.txt
+14
-5
@@ -11,11 +11,20 @@ SYNOPSIS
11
12
DESCRIPTION
13
-----------
14
-Each commit between the fork-point and <head> is examined, and compared against
15
-the change each commit between the fork-point and <upstream> introduces.
16
-Commits already included in upstream are prefixed with '-' (meaning "drop from
17
-my local pull"), while commits missing from upstream are prefixed with '+'
18
-(meaning "add to the updated upstream").
14
+The changeset (or "diff") of each commit between the fork-point and <head>
15
+is compared against each commit between the fork-point and <upstream>.
16
+
17
+Every commit with a changeset that doesn't exist in the other branch
18
+has its id (sha1) reported, prefixed by a symbol. Those existing only
19
+in the <upstream> branch are prefixed with a minus (-) sign, and those
20
+that only exist in the <head> branch are prefixed with a plus (+) symbol.
21
+
22
+Because git-cherry compares the changeset rather than the commit id
23
+(sha1), you can use git-cherry to find out if a commit you made locally
24
+has been applied <upstream> under a different commit id. For example,
25
+this will happen if you're feeding patches <upstream> via email rather
26
+than pushing or pulling commits directly.
27
+
28
29
OPTIONS
30
-------