Merge branch 'jc/count' into next

diff --git a/builtin.h b/builtin.h
index 8d5744fa42add9926721d8a9702f0677180b6b48..7f06812b8674fdfe5f54d901677320d7f8717a97 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -22,7 +22,7 @@ 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