Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile

diff --git a/Documentation/git-column.txt b/Documentation/git-column.txt
index 9be16eea0e5075fb9cffb071cbb498cd44e10f5b..03d18465d4f2cc8327362917d1c808e523333d11 100644 (file)
--- a/Documentation/git-column.txt
+++ b/Documentation/git-column.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
-            [--indent=<string>] [--nl=<string>] [--pading=<n>]
+            [--indent=<string>] [--nl=<string>] [--padding=<n>]
 
 DESCRIPTION
 -----------
@@ -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