diff --git a/.gitattributes b/.gitattributes index e218bbe25df..afd02555f59 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,4 @@ /vendor/** -text -eol linguist-vendored /web_src/js/vendor/** -text -eol linguist-vendored Dockerfile.* linguist-language=Dockerfile +Makefile.* linguist-language=Makefile diff --git a/.gitignore b/.gitignore index 7e8e5f84a72..11af4543bd2 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,6 @@ prime/ # Ignore worktrees when working on multiple branches .worktrees/ + +# A Makefile for custom make targets +Makefile.local diff --git a/Makefile b/Makefile index de2a486ea1d..5dbf1417236 100644 --- a/Makefile +++ b/Makefile @@ -198,6 +198,10 @@ TEST_MSSQL_DBNAME ?= gitea TEST_MSSQL_USERNAME ?= sa TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1 +# Include local Makefile +# Makefile.local is listed in .gitignore +sinclude Makefile.local + .PHONY: all all: build