Clarify git-cherry documentation.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago · 81ae43cdc4
1 changed files with 14 additions and 5 deletions
--- 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 changeset (or "diff") of each commit between the fork-point and <head>
-the change each commit between the fork-point and <upstream> introduces.
+is compared against each commit between the fork-point and <upstream>.
-Commits already included in upstream are prefixed with '-' (meaning "drop from
+
-my local pull"), while commits missing from upstream are prefixed with '+'
+Every commit with a changeset that doesn't exist in the other branch
-(meaning "add to the updated upstream").
+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
 -------