mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update cherry documentation.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-10-24 23:14:30 -07:00
parent d47107d810
commit 6e7d76baee
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-cherry.txt
View File

@ -14,8 +14,9 @@ DESCRIPTION
The changeset (or "diff") of each commit between the fork-point and <head> The changeset (or "diff") of each commit between the fork-point and <head>
is compared against each commit between the fork-point and <upstream>. is compared against each commit between the fork-point and <upstream>.
Every commit with a changeset that doesn't exist in the other branch Every commit that doesn't exist in the <upstream> branch
has its id (sha1) reported, prefixed by a symbol. Those existing only 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 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. that only exist in the <head> branch are prefixed with a plus (+) symbol.

4
git-cherry.sh
View File

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