rebase: use the new git-rebase--preserve-merges.sh

diff --git a/transport.c b/transport.c
index b9dfa11bd2a1f849f2c2d33aa4943a1ea9cb2d8b..94eccf29aa3f9758f5acaa9daddedcd559ad3915 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -18,6 +18,7 @@
 #include "sha1-array.h"
 #include "sigchain.h"
 #include "transport-internal.h"
+#include "object-store.h"
 
 static void set_upstreams(struct transport *transport, struct ref *refs,
        int pretend)