From: Junio C Hamano <junkio@cox.net>
Date: Sat, 20 May 2006 00:30:34 +0000 (-0700)
Subject: Merge branch 'lt/dirwalk' into next
X-Git-Tag: v1.4.1-rc1~82
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bf78d1a6cb65fe877a8d90b9d4ec95678621ff17;p=git.git

Merge branch 'lt/dirwalk' into next

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

bf78d1a6cb65fe877a8d90b9d4ec95678621ff17
diff --cc builtin.h
index 78275ea45,c1cb765de..d150c7ce5
--- a/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 7db5cc1a5,20c0f197a..63aa31143
--- a/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;