summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-24 22:31:19 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-24 22:31:19 -0700
commit4c2608923f30c0e79f2f424e068a2c0fee0baeba (patch)
tree0aaa3fecff73ab428999cb9156f8abc075516abe /Documentation
parentMerge branch 'np/delta' into next (diff)
parentDeprecate usage of git-var -l for getting config vars list (diff)
downloadtgif-4c2608923f30c0e79f2f424e068a2c0fee0baeba.tar.xz
Merge branch 'pb/config' into next
* pb/config: Deprecate usage of git-var -l for getting config vars list git-repo-config --list support
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-repo-config.txt4
-rw-r--r--Documentation/git-var.txt3
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index 71f96bdd10..566cfa1836 100644
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -15,6 +15,7 @@ SYNOPSIS
'git-repo-config' [type] --get-all name [value_regex]
'git-repo-config' [type] --unset name [value_regex]
'git-repo-config' [type] --unset-all name [value_regex]
+'git-repo-config' -l | --list
DESCRIPTION
-----------
@@ -64,6 +65,9 @@ OPTIONS
--unset-all::
Remove all matching lines from .git/config.
+-l, --list::
+ List all variables set in .git/config.
+
EXAMPLE
-------
diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 379571eef0..a5b1a0dbab 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -19,7 +19,8 @@ OPTIONS
-l::
Cause the logical variables to be listed. In addition, all the
variables of the git configuration file .git/config are listed
- as well.
+ as well. (However, the configuration variables listing functionality
+ is deprecated in favor of `git-repo-config -l`.)
EXAMPLE
--------