rebase: Support preserving merges in non-interactive mode

diff --git a/remote.h b/remote.h
index 2601f6e76d52c6a201e3952fb8b2c988eed33700..c6163ff5b1f7e7c96bedaa9a6b561a9f4a8ed7c2 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -77,8 +77,6 @@ void ref_remove_duplicates(struct ref *ref_map);
 
 int valid_fetch_refspec(const char *refspec);
 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec);
-struct refspec *parse_push_refspec(int nr_refspec, const char **refspec);
-void free_refspecs(struct refspec *refspec, int nr_refspec);
 
 int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
               int nr_refspec, const char **refspec, int all);