pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/transport.h b/transport.h
index 7a242fe3bd68e55e5807268e5c381c3c89f96a47..7cea5cc7234185b1c37ada818dfa1a9114621ad2 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -91,6 +91,7 @@ struct transport {
 #define TRANSPORT_PUSH_VERBOSE 16
 #define TRANSPORT_PUSH_PORCELAIN 32
 #define TRANSPORT_PUSH_QUIET 64
+#define TRANSPORT_PUSH_SET_UPSTREAM 128
 
 /* Returns a transport suitable for the url */
 struct transport *transport_get(struct remote *, const char *);