]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/whitespace-incomplete-line'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Feb 2026 23:11:52 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Feb 2026 23:11:52 +0000 (15:11 -0800)
It does not make much sense to apply the "incomplete-line"
whitespace rule to symbolic links, whose contents almost always
lack the final newline.  "git apply" and "git diff" are now taught
to exclude them for a change to symbolic links.

* jc/whitespace-incomplete-line:
  whitespace: symbolic links usually lack LF at the end

1  2 
apply.c
diff.c

diff --cc apply.c
Simple merge
diff --cc diff.c
Simple merge