diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-11 22:15:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-11 22:15:28 -0700 |
| commit | 04c6e9e9ca34226db095bbaa1218030f99f0b7c6 (patch) | |
| tree | 908b3080f7e373c20805d917bba6c2c2d505da1d /t/t7602-merge-octopus-many.sh | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-04c6e9e9ca34226db095bbaa1218030f99f0b7c6.tar.xz | |
diff --check: do not unconditionally complain about trailing empty lines
Recently "git diff --check" learned to detect new trailing blank lines
just like "git apply --whitespace" does. However this check should not
trigger unconditionally. This patch makes it honor the whitespace
settings from core.whitespace and gitattributes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions