Merge branch 'ew/daemon-socket-keepalive'

diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index 5c6ebdfad93ea87f973194b2fe31e784033dc3c6..c3616e7711aef80ee7e2bd3bb90ea5cee7dd1d4b 100644 (file)
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -32,7 +32,7 @@ OPTIONS
 --batch::
        Allow building of more than one tree object before exiting.  Each
        tree is separated by as single blank line. The final new-line is
-       optional.  Note - if the '-z' option is used, lines are terminated
+       optional.  Note - if the `-z` option is used, lines are terminated
        with NUL.
 
 GIT