Merge branch 'so/rebase-doc-fork-point'

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index f07b4513ed76978e3bb7ef02ebf31d504f7098ff..b0017795208d971eb40001ff20bd2516c8d9a58e 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -76,7 +76,7 @@ diff.ignoreSubmodules::
        this setting when reporting uncommitted changes. Setting it to
        'all' disables the submodule summary normally shown by 'git commit'
        and 'git status' when 'status.submodulesummary' is set unless it is
-       overridden by using the --ignore-submodules command line option.
+       overridden by using the --ignore-submodules command-line option.
        The 'git submodule' commands are not affected by this setting.
 
 diff.mnemonicprefix::