Merge branch 'pk/rebase-in-c-2-basic'

diff --git a/cache.h b/cache.h
index f7fabdde8f37d857f6160c0e4798788f1963d3ae..8b1ee42ae93b4bfd025f0f761e6adeac6c642907 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1487,6 +1487,7 @@ extern const char *fmt_name(const char *name, const char *email);
 extern const char *ident_default_name(void);
 extern const char *ident_default_email(void);
 extern const char *git_editor(void);
+extern const char *git_sequence_editor(void);
 extern const char *git_pager(int stdout_is_tty);
 extern int is_terminal_dumb(void);
 extern int git_ident_config(const char *, const char *, void *);