aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-11-21 09:14:18 -0800
committerJunio C Hamano <gitster@pobox.com>2025-11-21 09:14:18 -0800
commit7895a60969d59ce9805ce5c88921e13bc8215d8b (patch)
tree2525fa6c2c698165fb3bcdee501d10da50834a80
parentc62d2d381087b6ab0f485dc9d27346ff887600cc (diff)
parent358e94dc7059500af09435112ef1d4e5f7692e52 (diff)
downloadgit-7895a60969d59ce9805ce5c88921e13bc8215d8b.tar.xz
Merge branch 'jc/gitattributes-whitespace-no-indent-fix'
Ever since we added whitespace rules for this project, we misspelt an entry, which has been corrected. * jc/gitattributes-whitespace-no-indent-fix: .gitattributes: remove misspelled no-op whitespace attribute
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 32583149c2..6e66623b12 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-* whitespace=!indent,trail,space
+* whitespace=trail,space
*.[ch] whitespace=indent,trail,space diff=cpp
*.sh whitespace=indent,trail,space text eol=lf
*.perl text eol=lf diff=perl