summaryrefslogtreecommitdiff
path: root/Documentation/diff-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:38:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:38:48 (GMT)
commited47bbd1d05ce7f78a52639e1b1fb522b975b066 (patch)
treef34673c4d03b285bd8d4ffc5555c2e98fb757141 /Documentation/diff-config.txt
parentaa4bffa23599e0c2e611be7012ecb5f596ef88b5 (diff)
parent06ab60c06606613f238f3154cb27cb22d9723967 (diff)
downloadgit-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.zip
git-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.tar.gz
git-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.tar.bz2
Merge branch 'jj/command-line-adjective'
* jj/command-line-adjective: Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
Diffstat (limited to 'Documentation/diff-config.txt')
-rw-r--r--Documentation/diff-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index f07b451..b001779 100644
--- 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::