Merge branch 'hv/coding-guidelines' into maint-1.7.11

diff --git a/Documentation/git-column.txt b/Documentation/git-column.txt
index 9be16eea0e5075fb9cffb071cbb498cd44e10f5b..5d6f1cc464a09131cc7898b67fb165c600e2045f 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
 -----------