From: Junio C Hamano <junkio@cox.net>
Date: Fri, 18 Nov 2005 08:11:28 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v0.99.9k~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6eb668df76a5b46bd24c25d227bfdba12542b05a;hp=-c;p=git.git

Merge branch 'master'
---

6eb668df76a5b46bd24c25d227bfdba12542b05a
diff --combined Makefile
index e5cf5ef4,3bdd0597..819c48ce
--- a/Makefile
+++ b/Makefile
@@@ -50,7 -50,7 +50,7 @@@
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-cache perspective.
  
 -GIT_VERSION = 0.99.9.GIT
 +GIT_VERSION = 0.99.9j
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@@ -466,7 -466,7 +466,7 @@@ deb: dis
  ### Cleaning rules
  
  clean:
- 	rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE)
+ 	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o git $(PROGRAMS) $(LIB_FILE)
  	rm -f $(filter-out gitk,$(SCRIPTS))
  	rm -f *.spec *.pyc *.pyo
  	rm -rf $(GIT_TARNAME)