Merge branch 'fk/blame'

* fk/blame:
  git-blame, take 2
  Merge part of 'lt/rev-list' into 'fk/blame'
  Add git-blame, a tool for assigning blame.

diff --combined Makefile
index a1ec04e,b67d1ab..b6d8804
--- 1/Makefile
--- 2/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-describe$X git-merge-tree$X git-blame$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -196,8 -196,7 +196,8 @@@ LIB_H = 
  
  DIFF_OBJS = \
        diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
 -      diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o
 +      diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
 +      diffcore-delta.o
  
  LIB_OBJS = \
        blob.o commit.o connect.o count-delta.o csum-file.o \
@@@ -224,15 -223,11 +224,15 @@@ ifeq ($(uname_S),Darwin
        NEEDS_SSL_WITH_CRYPTO = YesPlease
        NEEDS_LIBICONV = YesPlease
        ## fink
 -      ALL_CFLAGS += -I/sw/include
 -      ALL_LDFLAGS += -L/sw/lib
 +      ifeq ($(shell test -d /sw/lib && echo y),y)
 +              ALL_CFLAGS += -I/sw/include
 +              ALL_LDFLAGS += -L/sw/lib
 +      endif
        ## darwinports
 -      ALL_CFLAGS += -I/opt/local/include
 -      ALL_LDFLAGS += -L/opt/local/lib
 +      ifeq ($(shell test -d /opt/local/lib && echo y),y)
 +              ALL_CFLAGS += -I/opt/local/include
 +              ALL_LDFLAGS += -L/opt/local/lib
 +      endif
  endif
  ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease