mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 13:26:12 +02:00
Code

Merge branch 'tb/make-indent-conditional-with-non-spaces' into next 

Adjust to an upcoming changes to GNU make that breaks our Makefiles.

* tb/make-indent-conditional-with-non-spaces:
  Makefile(s): do not enforce "all indents must be done with tab"
  Makefile(s): avoid recipe prefix in conditional statements
This commit is contained in:
Junio C Hamano 2024-04-10 10:09:16 -07:00
parent ffb0c01871 227b8fd902
commit 98aa239dc3
5 changed files with 136 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-gui/.gitattributes vendored
View File

@ -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