Merge branch 'il/push-set-upstream'

* il/push-set-upstream:
  Add push --set-upstream

Conflicts:
	transport.c

diff --cc transport.c
index d7db2941fb135c8d956756ced762dc0a3dd75a4b,8cc287d4429212c385b1359943ba41deb8a0460d..7714fdb6c6578c711dc0b98a2086669a6a797257
--- 1/transport.c
--- 2/transport.c
+++ b/transport.c
@@@ -983,7 -1035,8 +1035,8 @@@ int transport_push(struct transport *tr
                int verbose = flags & TRANSPORT_PUSH_VERBOSE;
                int quiet = flags & TRANSPORT_PUSH_QUIET;
                int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
 -              int ret;
+               int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
 +              int ret, err;
  
                if (flags & TRANSPORT_PUSH_ALL)
                        match_flags |= MATCH_REFS_ALL;

diff --cc transport.h
Simple merge