Merge branch 'ag/rebase-i-in-c'

diff --git a/strbuf.h b/strbuf.h
index bf18fddb5bb7883c089b30cfabc54cc5a9d055b9..9981f782b2573c1a4360879e03884ec753999aec 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -582,10 +582,12 @@ void strbuf_add_unique_abbrev(struct strbuf *sb,
  * run in. If the buffer is NULL the editor is launched as usual but the
  * file's contents are not read into the buffer upon completion.
  */
-int launch_editor(const char *path,
-                 struct strbuf *buffer,
+int launch_editor(const char *path, struct strbuf *buffer,
                  const char *const *env);
 
+int launch_sequence_editor(const char *path, struct strbuf *buffer,
+                          const char *const *env);
+
 void strbuf_add_lines(struct strbuf *sb,
                      const char *prefix,
                      const char *buf,