Merge branch 'gp/branch'

diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 7d515be0fd3b89d602ac2919fd2ea3dd4bc84131..6338def5a795a8171286626752a96f8ac88842c8 100644 (file)
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -11,4 +11,3 @@
        command to re-code the commit log message in the encoding
        preferred by the user.  For non plumbing commands this
        defaults to UTF-8.
-