Merge branch 'jc/diff' into next

* jc/diff:
  built-in diff: assorted updates.
  built-in diff.

diff --cc Makefile
index 576067fafbd9fab97fa555ef7272d88e6a580892,277c1ac07932d9a00c58562533386e212c18b82a..895e6a1e4a7bc8a903b615f5852abbea862b403c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -214,7 -214,7 +214,7 @@@ LIB_OBJS = 
        $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
-       builtin-log.o builtin-help.o builtin-count.o
 -      builtin-log.o builtin-help.o builtin-diff.o
++      builtin-log.o builtin-help.o builtin-count.o builtin-diff.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz

diff --cc builtin.h
index 15bb313ee26a21db06ca17fa09d4d31c27ecb07f,52ffa526f801af2a0be65c2722fc64b33577b60d..bf310dda9e2dbd45352ac1764bc911caaca549c3
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -19,7 -19,6 +19,8 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, char **envp);
  extern int cmd_show(int argc, const char **argv, char **envp);
  extern int cmd_log(int argc, const char **argv, char **envp);
 +extern int cmd_format_patch(int argc, const char **argv, char **envp);
 +extern int cmd_count_objects(int argc, const char **argv, char **envp);
+ extern int cmd_diff(int argc, const char **argv, char **envp);
  
  #endif

diff --cc git.c
index 6d030b01cc6b9a884b68573124e06787f7beb61c,ff9b87abbce78b639596bbf3f02b11a34174346b..a6ec3bcbe52b3f245f8304003eb1af39debec98f
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -46,8 -46,7 +46,9 @@@ static void handle_internal_command(in
                { "log", cmd_log },
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
 +              { "fmt-patch", cmd_format_patch },
 +              { "count-objects", cmd_count_objects },
+               { "diffn", cmd_diff },
        };
        int i;
  

diff --cc revision.c
Simple merge