Merge branch 'jc/dirwalk-n-cache-tree' into next

* jc/dirwalk-n-cache-tree:
  builtin-rm: squelch compiler warnings.
This commit is contained in:
Junio C Hamano 2006-05-23 01:31:52 -07:00
commit 95f5bddcd2

View File

@ -6,6 +6,7 @@
#include "cache.h" #include "cache.h"
#include "builtin.h" #include "builtin.h"
#include "dir.h" #include "dir.h"
#include "cache-tree.h"
static const char builtin_rm_usage[] = static const char builtin_rm_usage[] =
"git-rm [-n] [-v] [-f] <filepattern>..."; "git-rm [-n] [-v] [-f] <filepattern>...";