Update cherry documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago · 6e7d76baee
2 changed files with 5 additions and 4 deletions
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@ -14,8 +14,9 @@ DESCRIPTION
				@@ -14,8 +14,9 @@ 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>.

-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
+Every commit that doesn't exist in the <upstream> branch
+has its id (sha1) reported, prefixed by a symbol.  The ones that have
+equivalent change already
 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.

--- a/git-cherry.sh
+++ b/git-cherry.sh
@ -12,8 +12,8 @@ LONG_USAGE='             __*__*__*__*__> <upstream>
				@@ -12,8 +12,8 @@ LONG_USAGE='             __*__*__*__*__> <upstream>
 Each commit between the fork-point (or <limit> if given) and <head> is
 examined, and compared against the change each commit between the
 fork-point and <upstream> introduces.  If the change seems to be in
-the upstream, it is shown on the standard output with prefix "+".
-Otherwise it is shown with prefix "-".'
+the upstream, it is shown on the standard output with prefix "-".
+Otherwise it is shown with prefix "+".'
 . git-sh-setup

 case "$1" in -v) verbose=t; shift ;; esac