Skip to content

Commit 8e04162

Browse files
committed
Merge branch 'kh/doc-config-list'
"git config list" is the official way to spell "git config -l" and "git config --list". Use it to update the documentation. * kh/doc-config-list: doc: gitcvs-migration: rephrase “man page” doc: replace git config --list/-l with `list`
2 parents 3eabc35 + 57177ad commit 8e04162

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

Documentation/git-var.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ OPTIONS
2222
Display the logical variables. In addition, all the
2323
variables of the Git configuration file .git/config are listed
2424
as well. (However, the configuration variables listing functionality
25-
is deprecated in favor of `git config -l`.)
25+
is deprecated in favor of `git config list`.)
2626

2727
EXAMPLES
2828
--------

Documentation/gitcvs-migration.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ them first before running git pull.
4949
================================
5050
The 'pull' command knows where to get updates from because of certain
5151
configuration variables that were set by the first 'git clone'
52-
command; see `git config -l` and the linkgit:git-config[1] man
53-
page for details.
52+
command; see the subcommand `list` in linkgit:git-config[1] for details.
5453
================================
5554

5655
You can update the shared repository with your changes by first committing

Documentation/gitprotocol-v2.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ use by the client, MUST indicate prerequisites (in any) with standard
659659
applicable.
660660
+
661661
The advertised URI may alternatively contain a plaintext file that `git
662-
config --list` would accept (with the `--file` option). The key-value
662+
config list` would accept (with the `--file` option). The key-value
663663
pairs in this list are in the `bundle.*` namespace (see
664664
linkgit:git-config[1]).
665665

Documentation/gittutorial.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ bob$ git config --get remote.origin.url
432432
-------------------------------------
433433

434434
(The complete configuration created by `git clone` is visible using
435-
`git config -l`, and the linkgit:git-config[1] man page
435+
`git config list`, and the linkgit:git-config[1] man page
436436
explains the meaning of each option.)
437437

438438
Git also keeps a pristine copy of Alice's `master` branch under the

Documentation/technical/api-trace2.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ it.
12531253
$ git config --system color.ui never
12541254
$ git config --global color.ui always
12551255
$ git config --local color.ui auto
1256-
$ git config --list --show-scope | grep 'color.ui'
1256+
$ git config list --show-scope | grep 'color.ui'
12571257
system color.ui=never
12581258
global color.ui=always
12591259
local color.ui=auto

Documentation/user-manual.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2865,7 +2865,7 @@ stored in Git configuration variables, which you can see using
28652865
linkgit:git-config[1]:
28662866

28672867
-------------------------------------------------
2868-
$ git config -l
2868+
$ git config list
28692869
core.repositoryformatversion=0
28702870
core.filemode=true
28712871
core.logallrefupdates=true

0 commit comments

Comments
 (0)