Merge branch 'ls/travis-enable-httpd-tests'

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index ff130250bea38e487ae4a57ad849059143865ddd..002dae625e5ab7cb834fd548dc0b4c23072a0b1b 100644 (file)
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -61,8 +61,8 @@ OPTIONS
        stuck to the option without a space.
 
 --no-gpg-sign::
-       Countermand `commit.gpgSign` configuration variable that is
-       set to force each and every commit to be signed.
+       Do not GPG-sign commit, to countermand a `--gpg-sign` option
+       given earlier on the command line.
 
 
 Commit Information