Merge branch 'jc/grep' into next

diff --git a/builtin.h b/builtin.h
index dca69632d2e3877a32524ec4a90c31523ba011a4..97e24644687d819fddf57beaaddf4bdda731bb82 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -19,8 +19,11 @@ extern int cmd_version(int argc, const char **argv, char **envp);
 extern int cmd_whatchanged(int argc, const char **argv, char **envp);
 extern int cmd_show(int argc, const char **argv, char **envp);
 extern int cmd_log(int argc, const char **argv, char **envp);
+extern int cmd_diff(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_push(int argc, const char **argv, char **envp);
+extern int cmd_grep(int argc, const char **argv, char **envp);
 
 #endif