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 | |
| parent | 3ea95d2b0e6fa63e66de24a5084e217102ab9e8a (diff) | |
| parent | 3bc52d7a95676bcdeeb61c372b44358daf817baa (diff) | |
| download | git-7a4566befef02b99aad3038f116b3ac24c4eb464.tar.gz git-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')
| -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 74d14c4e7..7deefdae8 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. |