diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-21 01:08:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 01:08:10 -0800 |
| commit | f873dd5ac22fee648f9097d5a91200b6f4850ae0 (patch) | |
| tree | effdbc042e8919b36c92faca7707f84bbbac2a07 /Documentation/config.txt | |
| parent | 2b5189e51855312a91dd23b5e7311c48944bc382 (diff) | |
| parent | 950db8798d51cb183c858938263425b367b21dfd (diff) | |
| download | git-f873dd5ac22fee648f9097d5a91200b6f4850ae0.tar.gz git-f873dd5ac22fee648f9097d5a91200b6f4850ae0.tar.xz | |
Merge branch 'maint'
* maint:
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6b3ac5aa9..290cb48eb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -635,7 +635,7 @@ diff.renames:: will enable basic rename detection. If set to "copies" or "copy", it will detect copies, as well. -diff.suppress-blank-empty:: +diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. |