Merge branch 'jc/grep' into next

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

diff --cc Makefile
index f184a8d4bb34a8a1a588732326f755dda2d81df3,8d5122bdd518e6d85d15304f7e7638b84c9b00e7..2aa3586d02619a844f44486f5aebfc8b518551cc
--- 1/Makefile
--- 2/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 8d5744fa42add9926721d8a9702f0677180b6b48,cf5de3b9311569293399f2abf38417711b9ff7ce..7f06812b8674fdfe5f54d901677320d7f8717a97
--- 1/builtin.h
--- 2/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 6a771747ebec9cda926a4a1546d35f0944e1ab74,893bddd768674e7389864510f04655615233ebe3..6d51add7d5d96be65e667b6d4eea9d607f1e2e67
--- 1/git.c
--- 2/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;