diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-07 17:07:40 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-07 17:07:40 -0800 |
commit | 2acc35b08706234f3762992d431db301ead5797e (patch) | |
tree | a1de0806e9be091287c42e4181b70530014e24f0 /Makefile | |
parent | e4a0e2aac0e667a3a9b4449c5be4e084c4a9c44e (diff) | |
parent | f067a13745fbeae1aa357876348a00e5edd0a629 (diff) | |
download | git-2acc35b08706234f3762992d431db301ead5797e.tar.gz |
Merge branch 'master' into next
* master:
repo-config: give value_ a sane default so regexec won't segfault
Update http-push functionality
cvsimport: Remove master-updating code
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -526,7 +526,7 @@ git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) -git-http-push$X: http.o http-push.o $(LIB_FILE) +git-http-push$X: revision.o http.o http-push.o $(LIB_FILE) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) |