Merge branch 'lt/dirwalk' into next

* lt/dirwalk:
  Add builtin "git rm" command
  Move pathspec matching from builtin-add.c into dir.c

diff --cc Makefile
Simple merge

diff --cc builtin-add.c
Simple merge

diff --cc builtin.h
index 78275ea,c1cb765..d150c7c
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -25,8 -24,7 +25,9 @@@ extern int cmd_count_objects(int argc, 
  
  extern int cmd_push(int argc, const char **argv, char **envp);
  extern int cmd_grep(int argc, const char **argv, char **envp);
+ extern int cmd_rm(int argc, const char **argv, char **envp);
  extern int cmd_add(int argc, const char **argv, char **envp);
 +extern int cmd_rev_list(int argc, const char **argv, char **envp);
 +extern int cmd_check_ref_format(int argc, const char **argv, char **envp);
  
  #endif

diff --cc git.c
index 7db5cc1,20c0f19..63aa311
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -51,9 -50,8 +51,10 @@@ static void handle_internal_command(in
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff },
                { "grep", cmd_grep },
+               { "rm", cmd_rm },
                { "add", cmd_add },
 +              { "rev-list", cmd_rev_list },
 +              { "check-ref-format", cmd_check_ref_format }
        };
        int i;