diff options
| author |  Jim Meyering <meyering@redhat.com> | 2008-08-15 13:39:26 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-08-19 18:09:37 -0700 |
| commit | a624eaa7820f4f9814e41e911c665a0aba2fce34 (patch) | |
| tree | 315d6c0ea6c2e4bb2b2f2de40a1468c58825a0e4 /builtin-merge-recursive.c | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-a624eaa7820f4f9814e41e911c665a0aba2fce34.tar.xz | |
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 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions