![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d47107d)
raw | patch | inline | side by side (parent: d47107d)
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 25 Oct 2006 06:14:30 +0000 (23:14 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 25 Oct 2006 19:56:37 +0000 (12:56 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/git-cherry.txt | patch | blob | history | |
| git-cherry.sh | patch | blob | history |
index 893baaa6f656616b2151c572450e037fabee7622..e1bf8ee255e531c1c790ec9f10815f3f972000f8 100644 (file)
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.
diff --git a/git-cherry.sh b/git-cherry.sh
index 8832573fee9d3b8d4be92786ae5116ee6e5405bb..cf7af5502cd829074578237fc123eaa1ef37ab23 100755 (executable)
--- a/git-cherry.sh
+++ b/git-cherry.sh
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