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

diff --git a/transport.h b/transport.h
index 97ba2519dd6db2a4341def590e06cbc81b33fed2..7cea5cc7234185b1c37ada818dfa1a9114621ad2 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -74,7 +74,7 @@ struct transport {
        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;
        signed verbose : 3;
-       /* Force progress even if the output is not a tty */
+       /* Force progress even if stderr is not a tty */
        unsigned progress : 1;
        /*
         * If transport is at least potentially smart, this points to
@@ -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 *);