diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-24 23:14:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-25 12:56:37 -0700 |
| commit | 6e7d76baee08d0cd131d443c347c8a4bcd1004db (patch) | |
| tree | 59e5b7b202b87b5dfa364955556191bb3ee4fbe3 | |
| parent | d47107d8104167dfe65c1743e81fa670b33f7870 (diff) | |
| download | git-6e7d76baee08d0cd131d443c347c8a4bcd1004db.tar.gz git-6e7d76baee08d0cd131d443c347c8a4bcd1004db.tar.xz | |
Update cherry documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-cherry.txt | 5 | ||||
| -rwxr-xr-x | git-cherry.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 893baaa6f..e1bf8ee25 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -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. diff --git a/git-cherry.sh b/git-cherry.sh index 8832573fe..cf7af5502 100755 --- a/git-cherry.sh +++ b/git-cherry.sh @@ -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 |