From: Junio C Hamano <junkio@cox.net>
Date: Mon, 1 May 2006 08:54:02 +0000 (-0700)
Subject: Merge branch 'jc/grep' into next
X-Git-Tag: v1.4.1-rc1~160
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=afbe700e43b06ef87be493583953d7cf71ab4405;p=git.git

Merge branch 'jc/grep' into next

* jc/grep:
  built-in "git grep"
---

afbe700e43b06ef87be493583953d7cf71ab4405
diff --cc Makefile
index f184a8d4b,8d5122bdd..2aa3586d0
--- a/Makefile
+++ b/Makefile
@@@ -214,8 -214,7 +214,8 @@@ LIB_OBJS = 
  	$(DIFF_OBJS)
  
  BUILTIN_OBJS = \
 -	builtin-log.o builtin-help.o builtin-grep.o
 +	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \
- 	builtin-push.o
++	builtin-push.o builtin-grep.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
diff --cc builtin.h
index 8d5744fa4,cf5de3b93..7f06812b8
--- a/builtin.h
+++ b/builtin.h
@@@ -19,10 -19,6 +19,10 @@@ 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);
- 
 +extern int cmd_push(int argc, const char **argv, char **envp);
+ extern int cmd_grep(int argc, const char **argv, char **envp);
  
  #endif
diff --cc git.c
index 6a771747e,893bddd76..6d51add7d
--- a/git.c
+++ b/git.c
@@@ -46,10 -46,7 +46,11 @@@ 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 },
 +		{ "push", cmd_push },
+ 		{ "grep", cmd_grep },
  	};
  	int i;