From: Junio C Hamano <junkio@cox.net>
Date: Sat, 11 Mar 2006 06:32:59 +0000 (-0800)
Subject: Merge branch 'fk/blame' into next
X-Git-Tag: v1.3.0-rc1~39
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c301a0d2cf49b57f246ad73d0fd9f1cf203e7c16;hp=-c;p=git.git

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
---

c301a0d2cf49b57f246ad73d0fd9f1cf203e7c16
diff --combined Makefile
index 006b2120,8a20c76e..0bdf03b7
--- a/Makefile
+++ b/Makefile
@@@ -165,7 -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)
@@@ -190,7 -190,7 +190,7 @@@ PYMODULES = 
  LIB_FILE=libgit.a
  
  LIB_H = \
 -	blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
 +	blob.h cache.h commit.h csum-file.h delta.h \
  	diff.h object.h pack.h pkt-line.h quote.h refs.h \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
  
@@@ -200,7 -200,7 +200,7 @@@ DIFF_OBJS = 
  	diffcore-delta.o
  
  LIB_OBJS = \
 -	blob.o commit.o connect.o count-delta.o csum-file.o \
 +	blob.o commit.o connect.o csum-file.o \
  	date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o \
  	quote.o read-cache.o refs.o run-command.o \
@@@ -525,6 -525,8 +525,8 @@@ git-ssh-upload$X: rsh.
  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)