Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 7e03fcc62d1a388552cdd1e92f75183c0278cf28..7ae50aa26aff26cb9dd619abc7c29372c4156bcc 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -27,7 +27,7 @@ gitk-specific options.
 
 gitk generally only understands options with arguments in the
 'sticked' form (see linkgit:gitcli[7]) due to limitations in the
-command line parser.
+command-line parser.
 
 rev-list options and arguments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~