summaryrefslogtreecommitdiffstats
path: root/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-03 16:07:25 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-03 16:07:25 -0700
commit22700fb0070b260261fc5003205fe9aa9e080ce5 (patch)
tree5a1a599cd0bb7d43f653facfe7afb9c71c412ab8 /git-branch.txt
parentb76a68630eaab75c4eb1c41f0fc091811854ff43 (diff)
downloadgit-htmldocs-22700fb0070b260261fc5003205fe9aa9e080ce5.tar.gz
Autogenerated HTML docs for v1.7.10.1-456-g16798
Diffstat (limited to 'git-branch.txt')
-rw-r--r--git-branch.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/git-branch.txt b/git-branch.txt
index e71370d6b..47235bea0 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -10,6 +10,7 @@ SYNOPSIS
[verse]
'git branch' [--color[=<when>] | --no-color] [-r | -a]
[--list] [-v [--abbrev=<length> | --no-abbrev]]
+ [--column[=<options>] | --no-column]
[(--merged | --no-merged | --contains) [<commit>]] [<pattern>...]
'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -107,6 +108,14 @@ OPTIONS
default to color output.
Same as `--color=never`.
+--column[=<options>]::
+--no-column::
+ Display branch listing in columns. See configuration variable
+ column.branch for option syntax.`--column` and `--no-column`
+ without options are equivalent to 'always' and 'never' respectively.
++
+This option is only applicable in non-verbose mode.
+
-r::
--remotes::
List or delete (if used with -d) the remote-tracking branches.