From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 22:40:48 +0000 (-0800)
Subject: Merge branch 'il/push-set-upstream'
X-Git-Tag: v1.7.0-rc0~71
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=533e8af50ed6e89eabc421478c9021c4da5f404d;p=git.git

Merge branch 'il/push-set-upstream'

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

Conflicts:
	transport.c
---

533e8af50ed6e89eabc421478c9021c4da5f404d
diff --cc transport.c
index d7db2941f,8cc287d44..7714fdb6c
--- a/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 pretend = flags & TRANSPORT_PUSH_DRY_RUN;
 -		int ret;
 +		int ret, err;
  
  		if (flags & TRANSPORT_PUSH_ALL)
  			match_flags |= MATCH_REFS_ALL;