Merge branch 'master' into next

diff --git a/builtin.h b/builtin.h
index 15bb313ee26a21db06ca17fa09d4d31c27ecb07f..7f06812b8674fdfe5f54d901677320d7f8717a97 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -21,5 +21,8 @@ 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_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