rebase: deprecate --preserve-merges

diff --git a/fetch-object.h b/fetch-object.h
index d2f996d4e8c79c7bde78780dad5ad543910fcc29..d6444caa5ac11b586fba327b66c647e81b0c1d90 100644 (file)
--- a/fetch-object.h
+++ b/fetch-object.h
@@ -1,6 +1,8 @@
 #ifndef FETCH_OBJECT_H
 #define FETCH_OBJECT_H
 
+struct object_id;
+
 void fetch_objects(const char *remote_name, const struct object_id *oids,
                   int oid_nr);