From b66f3b6bba3a4e0210f8d63ce456f3055c8aa85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Thu, 23 Mar 2017 12:03:26 +0000 Subject: [PATCH 1/2] branch doc: change `git branch ` to use `` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change an example for `git branch ` to say `git branch ` to be consistent with the synopsis. This changes documentation added in d8d33736b5 ("branch: allow pattern arguments", 2011-08-28). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 28d46cc03b..6a17ca591a 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -142,7 +142,7 @@ This option is only applicable in non-verbose mode. List both remote-tracking branches and local branches. --list:: - Activate the list mode. `git branch ` would try to create a branch, + Activate the list mode. `git branch ` would try to create a branch, use `git branch --list ` to list matching branches. -v:: From 75ec4a6cb0921688d01a7e7800a5dd5d9f1ad586 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 23 Mar 2017 21:17:00 -0700 Subject: [PATCH 2/2] branch doc: update description for `--list` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The paragraph begins with a sample command line `git branch ` that has nothing to do with the option being described. Remove it, but use the space to instead show that multiple patterns can be given. Also mention the unfortunate `-l` that can be easily confused with it. Signed-off-by: Junio C Hamano Reviewed-by: Jonathan Nieder Reviewed-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 6a17ca591a..514b0d0b91 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -142,8 +142,13 @@ This option is only applicable in non-verbose mode. List both remote-tracking branches and local branches. --list:: - Activate the list mode. `git branch ` would try to create a branch, - use `git branch --list ` to list matching branches. + List branches. With optional `...`, e.g. `git + branch --list 'maint-*'`, list only the branches that match + the pattern(s). ++ +This should not be confused with `git branch -l `, +which creates a branch named `` with a reflog. +See `--create-reflog` above for details. -v:: -vv::