From: Junio C Hamano <junkio@cox.net>
Date: Tue, 18 Apr 2006 20:52:46 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~207
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3d9681a0fc23a47d48b5df296cd267b0b6055b2?hp=-c

Merge branch 'master' into next

* master:
GIT 1.3.0
Add git-annotate(1) and git-blame(1)
diff --stat: make sure to set recursive.
git-svnimport symlink support
---

d3d9681a0fc23a47d48b5df296cd267b0b6055b2
diff --combined Makefile
index 84a4b84226,8aed3af016..f0be83b296
--- a/Makefile
+++ b/Makefile
@@@ -606,9 -606,6 +606,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
  
 +test-gsimm$X: test-gsimm.c gsimm.o rabinpoly.o
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -657,7 -654,6 +657,7 @@@ clean
  	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
  		$(LIB_FILE) $(XDIFF_LIB)
  	rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +	rm -f test-date$X test-delta$X test-gsimm$X
  	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
  	rm -rf $(GIT_TARNAME)
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
@@@ -675,7 -671,6 +675,6 @@@ check-docs:
  	@for v in $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk; \
  	do \
  		case "$$v" in \
- 		git-annotate | git-blame | \
  		git-merge-octopus | git-merge-ours | git-merge-recursive | \
  		git-merge-resolve | git-merge-stupid | \
  		git-ssh-pull | git-ssh-push ) continue ;; \