Skip to content

Commit 6e7d76b

Browse files
author
Junio C Hamano
committed
Update cherry documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent d47107d commit 6e7d76b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Documentation/git-cherry.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ DESCRIPTION
1414
The changeset (or "diff") of each commit between the fork-point and <head>
1515
is compared against each commit between the fork-point and <upstream>.
1616

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
1920
in the <upstream> branch are prefixed with a minus (-) sign, and those
2021
that only exist in the <head> branch are prefixed with a plus (+) symbol.
2122

git-cherry.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ LONG_USAGE=' __*__*__*__*__> <upstream>
1212
Each commit between the fork-point (or <limit> if given) and <head> is
1313
examined, and compared against the change each commit between the
1414
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 "+".'
1717
. git-sh-setup
1818

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

0 commit comments

Comments
 (0)