Merge branch 'np/pack' into next

diff --git a/builtin.h b/builtin.h
index 635a00bf7a20ef347944f364c5f89e978ce50af9..97e24644687d819fddf57beaaddf4bdda731bb82 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -24,5 +24,6 @@ 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_push(int argc, const char **argv, char **envp);
+extern int cmd_grep(int argc, const char **argv, char **envp);
 
 #endif