From: Junio C Hamano <junkio@cox.net>
Date: Sat, 29 Apr 2006 08:33:16 +0000 (-0700)
Subject: Merge branch 'jc/diff' into next
X-Git-Tag: v1.4.1-rc1~164
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a0c5081a78bef2167d9663fe0847b757a6a797f5;p=git.git

Merge branch 'jc/diff' into next

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

a0c5081a78bef2167d9663fe0847b757a6a797f5
diff --cc Makefile
index 576067faf,277c1ac07..895e6a1e4
--- a/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 15bb313ee,52ffa526f..bf310dda9
--- a/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 6d030b01c,ff9b87abb..a6ec3bcbe
--- a/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;