diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-27 05:47:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-27 05:47:27 (GMT) |
| commit | 0f583175317a1c5c57b56c87856fbe46c3f3c296 (patch) | |
| tree | 743751d750cb7355c02dd2aa7f53a655ba6fd11c /Documentation/git-cherry.txt | |
| parent | b033b4e48195ef5974b7255f30de2cd7f67868b8 (diff) | |
| parent | aba2da13391d2adc72c0a2805e7196db2c803753 (diff) | |
| download | git-0f583175317a1c5c57b56c87856fbe46c3f3c296.zip git-0f583175317a1c5c57b56c87856fbe46c3f3c296.tar.gz git-0f583175317a1c5c57b56c87856fbe46c3f3c296.tar.bz2 | |
Merge master branch changes into release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cherry.txt')
| -rw-r--r-- | Documentation/git-cherry.txt | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 14d0bd5..9ff7bc2 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -3,26 +3,30 @@ git-cherry(1) NAME ---- -git-cherry - Some git command not yet documented. - +git-cherry - Find commits not merged upstream. SYNOPSIS -------- -'git-cherry' [ --option ] <args>... +'git-cherry' [-v] <upstream> [<head>] DESCRIPTION ----------- -Does something not yet documented. - +Each commit between the fork-point and <head> is examined, and compared against +the change each commit between the fork-point and <upstream> introduces. +Commits already included in upstream are prefixed with '-' (meaning "drop from +my local pull"), while commits missing from upstream are prefixed with '+' +(meaning "add to the updated upstream"). OPTIONS ------- ---option:: - Some option not yet documented. +-v:: + Verbose. -<args>...:: - Some argument not yet documented. +<upstream>:: + Upstream branch to compare against. +<head>:: + Working branch; defaults to HEAD. Author ------ |