Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'

diff --git a/builtin.h b/builtin.h
index 962f0489ab212cc613d98ac2577f3999278d099b..6538932e99a72f1be97c41806ca6e394f18f9a0c 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -204,7 +204,8 @@ extern int cmd_pull(int argc, const char **argv, const char *prefix);
 extern int cmd_push(int argc, const char **argv, const char *prefix);
 extern int cmd_range_diff(int argc, const char **argv, const char *prefix);
 extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
-extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
+extern int cmd_rebase(int argc, const char **argv, const char *prefix);
+extern int cmd_rebase__interactive(int argc, const char **argv, const char *prefix);
 extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
 extern int cmd_reflog(int argc, const char **argv, const char *prefix);
 extern int cmd_remote(int argc, const char **argv, const char *prefix);