Merge branch 'cc/skip' into HEAD

diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index c22d34f5fb9df2ce567f72a996f3d85b424ecf69..813942368b31a9eccb1c06b67e1a4303d3b62ede 100644 (file)
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -3,12 +3,12 @@ git-var(1)
 
 NAME
 ----
-git-var - Print the git users identity
+git-var - Show a git logical variable
 
 
 SYNOPSIS
 --------
-git-var [ -l | <variable> ]
+'git-var' [ -l | <variable> ]
 
 DESCRIPTION
 -----------
@@ -17,7 +17,10 @@ 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. (However, the configuration variables listing functionality
+       is deprecated in favor of `git-config -l`.)
 
 EXAMPLE
 --------
@@ -46,6 +49,7 @@ See Also
 --------
 gitlink:git-commit-tree[1]
 gitlink:git-tag[1]
+gitlink:git-config[1]
 
 Author
 ------
@@ -58,4 +62,3 @@ Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-