Merge branch 'pt/pull-ff-vs-merge-ff' into maint

diff --git a/Documentation/git-column.txt b/Documentation/git-column.txt
index 5d6f1cc464a09131cc7898b67fb165c600e2045f..03d18465d4f2cc8327362917d1c808e523333d11 100644 (file)
--- a/Documentation/git-column.txt
+++ b/Documentation/git-column.txt
@@ -43,11 +43,6 @@ OPTIONS
 --padding=<N>::
        The number of spaces between columns. One space by default.
 
-
-Author
-------
-Written by Nguyen Thai Ngoc Duy <pclouds@gmail.com>
-
 GIT
 ---
 Part of the linkgit:git[1] suite