diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:34 -0700 |
| commit | 073d0b0914af3a9c958175fde5c8f2cc278498db (patch) | |
| tree | 0024f68fed38ec103d5ab6d3ca8a7313d66ac664 /Documentation/diff-config.txt | |
| parent | mailmap: use main email address for dturner (diff) | |
| parent | doc: change configuration variables format (diff) | |
| download | tgif-073d0b0914af3a9c958175fde5c8f2cc278498db.tar.xz | |
Merge branch 'tr/doc-tt' into maint
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* tr/doc-tt:
doc: change configuration variables format
doc: more consistency in environment variables format
doc: change environment variables format
doc: clearer rule about formatting literals
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 d78cfc5a37..f1101c7b21 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -75,7 +75,7 @@ diff.ignoreSubmodules:: commands such as 'git diff-files'. 'git checkout' also honors 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 + and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. |