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

diff --cc builtin/push.c
index 6c373cf,fdfb2c4..d315475
--- 1/builtin/push.c
--- 2/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()
        };
  

diff --cc transport.c
Simple merge