diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-08 16:36:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-08 16:36:05 -0700 |
| commit | 227b8fd9024084209fc5fb24f89f3abe8c51592f (patch) | |
| tree | 7fc51e946d31d1aab2f86258a7e2ca02e31e9594 | |
| parent | 728b9ac0c3b93aaa4ea80280c591deb198051785 (diff) | |
| download | git-227b8fd9024084209fc5fb24f89f3abe8c51592f.tar.gz | |
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.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-gui/.gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/.gitattributes b/git-gui/.gitattributes index 59cd41dbff..118d56cfbd 100644 --- a/git-gui/.gitattributes +++ b/git-gui/.gitattributes @@ -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 |