From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2012 07:05:45 +0000 (-0800)
Subject: Merge branch 'fc/push-prune'
X-Git-Tag: v1.7.10-rc0~44
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d365a432271d2f6384cda9c37fb2fe463bdc2850;p=git.git

Merge branch 'fc/push-prune'

* fc/push-prune:
  push: add '--prune' option
  remote: refactor code into alloc_delete_ref()
  remote: reorganize check_pattern_match()
  remote: use a local variable in match_push_refs()

Conflicts:
	builtin/push.c
---

d365a432271d2f6384cda9c37fb2fe463bdc2850
diff --cc builtin/push.c
index 6c373cf28,fdfb2c451..d315475f1
--- a/builtin/push.c
+++ b/builtin/push.c
@@@ -260,7 -260,9 +260,9 @@@ int cmd_push(int argc, const char **arg
  		OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
  		OPT_BIT('u', "set-upstream", &flags, "set upstream for git pull/status",
  			TRANSPORT_PUSH_SET_UPSTREAM),
 -		OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
 +		OPT_BOOL(0, "progress", &progress, "force progress reporting"),
+ 		OPT_BIT(0, "prune", &flags, "prune locally removed refs",
+ 			TRANSPORT_PUSH_PRUNE),
  		OPT_END()
  	};