Merge branch 'jc/diff' into next

diff --git a/Documentation/git-applypatch.txt b/Documentation/git-applypatch.txt
index 4046360217f3f4f7db9b41deab0c06773473d431..5b9037de9f90626d9715de49e39f9708fdc25c75 100644 (file)
--- a/Documentation/git-applypatch.txt
+++ b/Documentation/git-applypatch.txt
@@ -30,7 +30,7 @@ OPTIONS
 <patch>::
        The patch to apply.
 
-<info>:
+<info>::
        Author and subject information extracted from e-mail,
        used on "author" line and as the first line of the
        commit log message.