summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-26 00:43:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-26 00:43:30 (GMT)
commitdddb4205351a973438e50e751ec1d6d8cbcada4f (patch)
treed6615a1cdc0746e02bf8871b7b02a88bb79f39a3
parent2638e33c825eb56260ad53be6b45bf31c1897ce9 (diff)
parent1b5b8cf072491e0a43e668c685b782efce9a6f0f (diff)
downloadgit-dddb4205351a973438e50e751ec1d6d8cbcada4f.zip
git-dddb4205351a973438e50e751ec1d6d8cbcada4f.tar.gz
git-dddb4205351a973438e50e751ec1d6d8cbcada4f.tar.bz2
Merge branch 'jc/maint-column-doc-typofix'
Doc update. * jc/maint-column-doc-typofix: Documentation: typofix --column description
-rw-r--r--Documentation/git-branch.txt2
-rw-r--r--Documentation/git-status.txt2
-rw-r--r--Documentation/git-tag.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index eb815c2..94dc9a5 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -153,7 +153,7 @@ OPTIONS
--column[=<options>]::
--no-column::
Display branch listing in columns. See configuration variable
- column.branch for option syntax.`--column` and `--no-column`
+ `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.
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index c0764e8..83f38e3 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -130,7 +130,7 @@ ignored, then the directory is not shown, but all contents are shown.
--column[=<options>]::
--no-column::
Display untracked files in columns. See configuration variable
- column.status for option syntax.`--column` and `--no-column`
+ `column.status` for option syntax. `--column` and `--no-column`
without options are equivalent to 'always' and 'never'
respectively.
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 56656d1..31a97a1 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -134,7 +134,7 @@ options for details.
--column[=<options>]::
--no-column::
Display tag listing in columns. See configuration variable
- column.tag for option syntax.`--column` and `--no-column`
+ `column.tag` for option syntax. `--column` and `--no-column`
without options are equivalent to 'always' and 'never' respectively.
+
This option is only applicable when listing tags without annotation lines.