author | Junio C Hamano <gitster@pobox.com> | |
Sat, 11 Dec 2010 00:40:09 +0000 (16:40 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 11 Dec 2010 00:40:09 +0000 (16:40 -0800) |
* 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
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
1 | 2 | |||
---|---|---|---|---|
Documentation/RelNotes/1.7.4.txt | patch | | diff1 | | diff2 | | blob | history |
Makefile | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/RelNotes/1.7.4.txt
Simple merge
diff --cc Makefile
index 7b22a5538d207dc3ddedc907e9f4a3be5e6655b9,41ab490dbd6e0decc20e02ac10e29daf99d9e07b..8cf7da9838d62de82c18656007f882f02963de8a
+++ b/Makefile
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 \