diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-08-15 11:39:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-20 01:09:37 (GMT) |
| commit | a624eaa7820f4f9814e41e911c665a0aba2fce34 (patch) | |
| tree | 315d6c0ea6c2e4bb2b2f2de40a1468c58825a0e4 /Documentation | |
| parent | c6670b348cb19c74a6d7f6943df4871eb0d8295f (diff) | |
| download | git-a624eaa7820f4f9814e41e911c665a0aba2fce34.zip git-a624eaa7820f4f9814e41e911c665a0aba2fce34.tar.gz git-a624eaa7820f4f9814e41e911c665a0aba2fce34.tar.bz2 | |
add boolean diff.suppress-blank-empty config option
GNU diff's --suppress-blank-empty option makes it so that diff no
longer outputs trailing white space unless the input data has it.
With this option, empty context lines are now empty also in diff -u output.
Before, they would have a single trailing space.
* diff.c (diff_suppress_blank_empty): New global.
(git_diff_basic_config): Set it.
(fn_out_consume): Honor it.
* t/t4029-diff-trailing-space.sh: New file.
* Documentation/config.txt: Document it.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 676c39b..9020675 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -567,6 +567,10 @@ diff.autorefreshindex:: affects only 'git-diff' Porcelain, and not lower level 'diff' commands, such as 'git-diff-files'. +diff.suppress-blank-empty:: + A boolean to inhibit the standard behavior of printing a space + before each empty output line. Defaults to false. + diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the |