@matheusbsbs / matheus-bagliano / commits / 6e7d76baee
Fork 0

Update cherry documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Oct 24, 2006 at 23:14 UTC 6e7d76baee08d0cd131d443c347c8a4bcd1004db
2 files changed +5 -4
Documentation/git-cherry.txt
+3 -2
@@ -14,8 +14,9 @@ DESCRIPTION
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
17 +Every commit that doesn't exist in the <upstream> branch
18 +has its id (sha1) reported, prefixed by a symbol. The ones that have
19 +equivalent change already
20 in the <upstream> branch are prefixed with a minus (-) sign, and those
21 that only exist in the <head> branch are prefixed with a plus (+) symbol.
22
git-cherry.sh
+2 -2
@@ -12,8 +12,8 @@ LONG_USAGE=' __*__*__*__*__> <upstream>
12 Each commit between the fork-point (or <limit> if given) and <head> is
13 examined, and compared against the change each commit between the
14 fork-point and <upstream> introduces. If the change seems to be in
15 -the upstream, it is shown on the standard output with prefix "+".
16 -Otherwise it is shown with prefix "-".'
15 +the upstream, it is shown on the standard output with prefix "-".
16 +Otherwise it is shown with prefix "+".'
17 . git-sh-setup
18
19 case "$1" in -v) verbose=t; shift ;; esac