From f29680221124d05581dd2db52a4e7f0fa15fa929 Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Mon, 29 Dec 2008 18:45:20 +0100 Subject: git-cherry: make parameter optional The upstream branch now defaults to the first tracked remote branch, which is set by the configuration variables branch..remote and branch..merge of the current branch. Without such a remote branch, the command "git cherry [-v]" fails with usage output as before and an additional message. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- Documentation/git-cherry.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation/git-cherry.txt') diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 74d14c4e7f..556ea23cd9 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] [] [] +'git cherry' [-v] [] [] [] DESCRIPTION ----------- @@ -51,6 +51,7 @@ OPTIONS :: Upstream branch to compare against. + Defaults to the first tracked remote branch, if available. :: Working branch; defaults to HEAD. -- cgit v1.2.3 From 3bc52d7a95676bcdeeb61c372b44358daf817baa Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Thu, 1 Jan 2009 22:56:29 +0100 Subject: Documentation: clarify which parameters are optional to git-cherry An earlier parameter is only optional when all of the later parameters are omitted. Signed-off-by: Junio C Hamano --- Documentation/git-cherry.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-cherry.txt') diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 556ea23cd9..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] [] [] [] +'git cherry' [-v] [ [ []]] DESCRIPTION ----------- -- cgit v1.2.3