diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-07-05 15:46:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-06 12:24:43 -0700 |
| commit | af0aa6904b700e72491ff381d89c163e80753da3 (patch) | |
| tree | 38a2cd4b1b8cf46bf4b2268d517c68f8097d1968 | |
| parent | 7b63ea57500c352c668b4fc1af97dbc5c28b5a40 (diff) | |
| download | git-af0aa6904b700e72491ff381d89c163e80753da3.tar.gz | |
Makefile & .gitignore: ignore & clean "git.res", not "*.res"
Adjust the overly broad .gitignore and "make clean" rule added in
ce39c2e04ce (Provide a Windows version resource for the git
executables., 2012-05-24).
For now this is merely a correctness fix, but needed because a
subsequent commit will want to check in *.res files elsewhere in the
tree, which we shouldn't have to "git add -f".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index a452215764..42fd7253b4 100644 --- a/.gitignore +++ b/.gitignore @@ -185,6 +185,7 @@ /git-worktree /git-write-tree /git-core-*/?* +/git.res /gitweb/GITWEB-BUILD-OPTIONS /gitweb/gitweb.cgi /gitweb/static/gitweb.js @@ -225,7 +226,6 @@ *.hcc *.obj *.lib -*.res *.sln *.sp *.suo @@ -3409,7 +3409,7 @@ cocciclean: clean: profile-clean coverage-clean cocciclean $(RM) -r .build $(RM) po/git.pot po/git-core.pot - $(RM) *.res + $(RM) git.res $(RM) $(OBJECTS) $(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X |