Merge branch 'jc/clean-config'

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 34c5caf2d08324cc1595013cbdcd40d89d7a1968..a42e1211500a6a6ecdf1d9e1ddbf6712869ceb79 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -84,4 +84,3 @@ This manual page is a stub. You can help the git documentation by expanding it.
 GIT
 ---
 Part of the gitlink:git[7] suite
-