diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-04-13 17:54:38 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-04-27 09:26:38 -0700 |
| commit | ebe31ef2ed539ec93f87c6705852f29347410b48 (patch) | |
| tree | 975ed4f5255f0212ae5013c1953c94f2bcb806f1 /Documentation | |
| parent | help: reuse print_columns() for help -a (diff) | |
| download | tgif-ebe31ef2ed539ec93f87c6705852f29347410b48.tar.xz | |
branch: add --column
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-branch.txt | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 01905a74ce..c7e97a5644 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -862,6 +862,10 @@ column.ui:: + This option defaults to 'never'. +column.branch:: + Specify whether to output branch listing in `git branch` in columns. + See `column.ui` for details. + commit.status:: A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 0427e80a35..ba5cccb519 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/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. |