diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-09 14:31:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-09 14:31:44 -0700 |
| commit | 4b4081034ba924644a150d8f84290ac3b26a5003 (patch) | |
| tree | 1fd79101f9c35324c4866e7a0fc3af8426824736 | |
| parent | 58dd7e4b116b1705cd809604a305de173ecc39e4 (diff) | |
| parent | b45602e392398f29be0af1ac7e202b996f99c747 (diff) | |
| download | git-4b4081034ba924644a150d8f84290ac3b26a5003.tar.gz | |
Merge branch 'mg/editorconfig-makefile'
The .editorconfig file has been taught that a Makefile uses HT
indentation.
* mg/editorconfig-makefile:
editorconfig: add Makefiles to "text files"
| -rw-r--r-- | .editorconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig index f9d819623d..15d6cbeab1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,7 @@ insert_final_newline = true # The settings for C (*.c and *.h) files are mirrored in .clang-format. Keep # them in sync. -[*.{c,h,sh,perl,pl,pm,txt}] +[{*.{c,h,sh,perl,pl,pm,txt},config.mak.*,Makefile}] indent_style = tab tab_width = 8 |