Merge branch 'jc/maint-combined-diff-work-tree' into maint

diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 458f3e2755fcc6431757af6178942ef756f6a5bd..5317cc247454b1a080b2609139befeba487d5ff5 100644 (file)
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -8,6 +8,7 @@ git-var - Show a git logical variable
 
 SYNOPSIS
 --------
+[verse]
 'git var' ( -l | <variable> )
 
 DESCRIPTION
@@ -65,14 +66,6 @@ linkgit:git-commit-tree[1]
 linkgit:git-tag[1]
 linkgit:git-config[1]
 
-Author
-------
-Written by Eric Biederman <ebiederm@xmission.com>
-
-Documentation
---------------
-Documentation by Eric Biederman and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite