diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:48 -0700 |
| commit | ed47bbd1d05ce7f78a52639e1b1fb522b975b066 (patch) | |
| tree | f34673c4d03b285bd8d4ffc5555c2e98fb757141 /Documentation/diff-config.txt | |
| parent | Merge branch 'jc/coding-guidelines' (diff) | |
| parent | Documentation: use "command-line" when used as a compound adjective, and fix ... (diff) | |
| download | tgif-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.tar.xz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index f07b4513ed..b001779520 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:: |