From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Aug 2005 07:10:18 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f69714c38c6f3296a4bfba0d057e0f1605373f49?ds=inline;hp=-c

Merge with master.

This merges commit
c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
edee414c3e5a546aae3dd1529f397df949713305

Sincerely,
jit-merge command.
---

f69714c38c6f3296a4bfba0d057e0f1605373f49
diff --combined Makefile
index df5f8c0dc3,5efb6268a1..e0ea88fbae
--- a/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION=0.99.3
 +GIT_VERSION=0.99.4
  
  COPTS?=-g -O2
  CFLAGS+=$(COPTS) -Wall $(DEFINES)
@@@ -70,6 -70,7 +70,7 @@@ SCRIPTS=git git-apply-patch-script git-
  
  SCRIPTS += git-count-objects-script
  # SCRIPTS += git-send-email-script
+ SCRIPTS += git-revert-script
  
  PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
  	git-read-tree git-commit-tree git-cat-file git-fsck-cache \
@@@ -156,9 -157,7 +157,9 @@@ all: $(PROG
  all:
  	$(MAKE) -C templates
  
 -.PRECIOUS: %.o
 +.SECONDARY: %.o
 +.c.o:
 +	$(CC) $(CFLAGS) -o $*.o -c $*.c
  git-%: %.o $(LIB_FILE)
  	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
  
@@@ -234,17 -233,17 +235,17 @@@ dist: git-core.spec git-tar-tre
  rpm: dist
  	$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
  
 -
 -backup: clean
 -	cd .. ; tar czvf dircache.tar.gz dir-cache
 -
 -
 +deb: dist
 +	rm -rf $(GIT_TARNAME)
 +	tar zxf $(GIT_TARNAME).tar.gz
 +	cd $(GIT_TARNAME) && fakeroot debian/rules binary
  
  ### Cleaning rules
  
  clean:
  	rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
 -	rm -f git-core-*.tar.gz git-core.spec
 +	rm -f $(GIT_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb
 +	rm -rf $(GIT_TARNAME)
  	$(MAKE) -C tools/ clean
  	$(MAKE) -C Documentation/ clean
  	$(MAKE) -C templates/ clean