diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:09:09 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:09:09 -0800 |
commit | 7a4566befef02b99aad3038f116b3ac24c4eb464 (patch) | |
tree | 7f7d4e6d95ddda85d4d86438f058363beafe9d2e /Documentation/git-cherry.txt | |
parent | Merge branch 'maint' (diff) | |
parent | Documentation: clarify which parameters are optional to git-cherry (diff) | |
download | tgif-7a4566befef02b99aad3038f116b3ac24c4eb464.tar.xz |
Merge branch 'mh/cherry-default'
* mh/cherry-default:
Documentation: clarify which parameters are optional to git-cherry
git-cherry: make <upstream> parameter optional
Diffstat (limited to 'Documentation/git-cherry.txt')
-rw-r--r-- | Documentation/git-cherry.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 74d14c4e7f..7deefdae8f 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git cherry' [-v] <upstream> [<head>] [<limit>] +'git cherry' [-v] [<upstream> [<head> [<limit>]]] DESCRIPTION ----------- @@ -51,6 +51,7 @@ OPTIONS <upstream>:: Upstream branch to compare against. + Defaults to the first tracked remote branch, if available. <head>:: Working branch; defaults to HEAD. |