From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Dec 2010 00:40:09 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~72
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d81e12d172ea32dedfb38c99e852405d3fa9e681;p=git.git

Merge branch 'master' into next

* master:
  Relnotes: remove items fixed on 'maint'
  Prepare for 1.7.3.4
  thread-utils.h: simplify the inclusion
  Makefile: transport-helper uses thread-utils.h
  Add --force to git-send-email documentation
---

d81e12d172ea32dedfb38c99e852405d3fa9e681
diff --cc Makefile
index 7b22a5538,41ab490db..8cf7da983
--- a/Makefile
+++ b/Makefile
@@@ -1952,10 -1943,9 +1952,9 @@@ builtin/log.o builtin/shortlog.o: short
  builtin/prune.o builtin/reflog.o reachable.o: reachable.h
  builtin/commit.o builtin/revert.o wt-status.o: wt-status.h
  builtin/tar-tree.o archive-tar.o: tar.h
- builtin/pack-objects.o: thread-utils.h
  connect.o transport.o http-backend.o: url.h
  http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
 -http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h
 +http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
  
  xdiff-interface.o $(XDIFF_OBJS): \
  	xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \