diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:42 -0700 |
| commit | 94c61d25dabd35b18dc64781084a5d14da7be016 (patch) | |
| tree | b43d8c6d675d5d55668f5574718014ef0c749fb3 /Documentation/diff-config.txt | |
| parent | af325b0f9abacda405e19947a929ad5a3a14cb90 (diff) | |
| parent | ae9f6311e9c15d7968c2d03eab6e929e9c9d5f42 (diff) | |
| download | git-94c61d25dabd35b18dc64781084a5d14da7be016.tar.gz git-94c61d25dabd35b18dc64781084a5d14da7be016.tar.xz | |
Merge branch 'tr/doc-tt'
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 d78cfc5a3..f1101c7b2 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. |