Merge branch 'lt/oneway' into next

diff --git a/builtin.h b/builtin.h
index bb63f0729a4a05e60ef3e609b971bdf57b60b06d..97e24644687d819fddf57beaaddf4bdda731bb82 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -20,8 +20,10 @@ 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