Skip to content

Commit 6a8c13e

Browse files
gitsterj6t
authored andcommitted
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 227b8fd90240] Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Johannes Sixt <[email protected]>
1 parent 1351570 commit 6a8c13e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
git-gui.sh encoding=UTF-8
44
/po/*.po encoding=UTF-8
55
/GIT-VERSION-GEN eol=lf
6+
Makefile whitespace=!indent,trail,space

0 commit comments

Comments
 (0)