Merge branch 'fc/push-prune'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:05:45 +0000 (23:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:05:45 +0000 (23:05 -0800)
commitd365a432271d2f6384cda9c37fb2fe463bdc2850
tree56fa405031b5951038d2d0189f4ac84b3801b0cb
parent5419127d0475a78983696544ca5e672e8ea4075d
parent6ddba5e241ebe484d53e3573c72386f487e25697
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
builtin/push.c
transport.c