aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-07-05 15:46:56 +0200
committerJunio C Hamano <gitster@pobox.com>2022-07-06 12:24:43 -0700
commitaf0aa6904b700e72491ff381d89c163e80753da3 (patch)
tree38a2cd4b1b8cf46bf4b2268d517c68f8097d1968 /.gitignore
parent7b63ea57500c352c668b4fc1af97dbc5c28b5a40 (diff)
downloadgit-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>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 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