Skip to content

Commit af0aa69

Browse files
avargitster
authored andcommitted
Makefile & .gitignore: ignore & clean "git.res", not "*.res"
Adjust the overly broad .gitignore and "make clean" rule added in ce39c2e (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7b63ea5 commit af0aa69

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
/git-worktree
186186
/git-write-tree
187187
/git-core-*/?*
188+
/git.res
188189
/gitweb/GITWEB-BUILD-OPTIONS
189190
/gitweb/gitweb.cgi
190191
/gitweb/static/gitweb.js
@@ -225,7 +226,6 @@
225226
*.hcc
226227
*.obj
227228
*.lib
228-
*.res
229229
*.sln
230230
*.sp
231231
*.suo

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3409,7 +3409,7 @@ cocciclean:
34093409
clean: profile-clean coverage-clean cocciclean
34103410
$(RM) -r .build
34113411
$(RM) po/git.pot po/git-core.pot
3412-
$(RM) *.res
3412+
$(RM) git.res
34133413
$(RM) $(OBJECTS)
34143414
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
34153415
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X

0 commit comments

Comments
 (0)