diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-09 11:21:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-09 11:21:44 +0300 |
| commit | 5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff (patch) | |
| tree | 47ff3839458d806fee14824f616c55cdd55b82fb /Makefile | |
| parent | 063036af0832710cfcb1380cc4f9c4597b98cc26 (diff) | |
| parent | b9217c09386e5313ac6a54cc91cf03149514154b (diff) | |
Merge branch 'maint'
* maint:
Start preparing for 1.5.3.6
git-send-email: Change the prompt for the subject of the initial message.
SubmittingPatches: improve the 'Patch:' section of the checklist
instaweb: Minor cleanups and fixes for potential problems
stop t1400 hiding errors in tests
Makefile: add missing dependency on wt-status.h
refresh_index_quietly(): express "optional" nature of index writing better
Fix sed string regex escaping in module_name.
Avoid a few unportable, needlessly nested "...`...".
git-mailsplit: with maildirs not only process cur/, but also new/
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -922,6 +922,7 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS) $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) +builtin-revert.o builtin-runstatus.o wt-status.o: wt-status.h $(LIB_FILE): $(LIB_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS) |