mirror of
https://github.com/git/git.git
synced 2024-09-08 03:50:44 +02:00
Makefile(s): do not enforce "all indents must be done with tab"
Our top-level Makefile follows our generic whitespace rule
established by the top-level .gitattributes file that does not
enforce indent-with-non-tab rule by default, but git-gui is set up
to enforce indent-with-non-tab by default. With the upcoming change
to GNU make, we no longer can reject (and worse, "fix") a patch that
adds whitespace indented lines to the Makefile, so loosen the rule
there for git-gui/Makefile, too.
[j6t: cherry-picked from 227b8fd902
]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
parent
1351570912
commit
6a8c13e03d
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -3,3 +3,4 @@
|
||||
git-gui.sh encoding=UTF-8
|
||||
/po/*.po encoding=UTF-8
|
||||
/GIT-VERSION-GEN eol=lf
|
||||
Makefile whitespace=!indent,trail,space
|
||||
|
Loading…
Reference in New Issue
Block a user