summaryrefslogtreecommitdiff
path: root/Documentation/git-var.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-24 22:31:15 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-24 22:31:15 -0700
commit5a6a8c0e012137a3f0059be40ec7b2f4aa614355 (patch)
tree842b775b4a96a35e98372e3073f314b8c6d2ff08 /Documentation/git-var.txt
parentMerge branch 'jc/cache-tree' into next (diff)
parentsplit the diff-delta interface (diff)
downloadtgif-5a6a8c0e012137a3f0059be40ec7b2f4aa614355.tar.xz
Merge branch 'np/delta' into next
* np/delta: split the diff-delta interface Document the configuration file Document git-var -l listing also configuration variables rev-parse: better error message for ambiguous arguments
Diffstat (limited to 'Documentation/git-var.txt')
-rw-r--r--Documentation/git-var.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 90cb157be5..379571eef0 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -17,7 +17,9 @@ Prints a git logical variable.
OPTIONS
-------
-l::
- Cause the logical variables to be listed.
+ Cause the logical variables to be listed. In addition, all the
+ variables of the git configuration file .git/config are listed
+ as well.
EXAMPLE
--------
@@ -46,6 +48,7 @@ See Also
--------
gitlink:git-commit-tree[1]
gitlink:git-tag[1]
+gitlink:git-repo-config[1]
Author
------