diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-10 22:32:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-10 22:32:59 -0800 |
| commit | c301a0d2cf49b57f246ad73d0fd9f1cf203e7c16 (patch) | |
| tree | b548ce5d5211efb71df3615973bd36f11282014b /Makefile | |
| parent | b8cfe290a891611c15bbb79c412d16e57ae8784e (diff) | |
| parent | 27e7304567c92c9771efa7a8b787c487391a5fcd (diff) | |
| download | git-c301a0d2cf49b57f246ad73d0fd9f1cf203e7c16.tar.gz git-c301a0d2cf49b57f246ad73d0fd9f1cf203e7c16.tar.xz | |
Merge branch 'fk/blame' into next
* fk/blame:
blame: Rename detection (take 2)
rev-lib: Make it easy to do rename tracking (take 2)
Make it possible to not clobber object.util in sort_in_topological_order (take 2)
Add git-imap-send, derived from isync 1.0.1.
repack: prune loose objects when -d is given
try_to_simplify_commit(): do not skip inspecting tree change at boundary.
Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
Describe how to add extra mail header lines in mail generated by git-format-patch.
Document the --attach flag.
allow double click on current HEAD id after git-pull
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -165,7 +165,7 @@ PROGRAMS = \ git-upload-pack$X git-verify-pack$X git-write-tree$X \ git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \ git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \ - git-describe$X git-merge-tree$X git-blame$X + git-describe$X git-merge-tree$X git-blame$X git-imap-send$X # what 'all' will build and 'install' will install, in gitexecdir ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) @@ -525,6 +525,8 @@ git-ssh-upload$X: rsh.o git-ssh-pull$X: rsh.o fetch.o git-ssh-push$X: rsh.o +git-imap-send$X: imap-send.o $(LIB_FILE) + git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) |