tree 56fa405031b5951038d2d0189f4ac84b3801b0cb
parent 5419127d0475a78983696544ca5e672e8ea4075d
parent 6ddba5e241ebe484d53e3573c72386f487e25697
author Junio C Hamano <gitster@pobox.com> 1330326345 -0800
committer Junio C Hamano <gitster@pobox.com> 1330326345 -0800

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