From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2015 21:43:56 +0000 (-0800)
Subject: Merge branch 'jc/push-to-checkout'
X-Git-Tag: v2.4.0-rc0~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cba07bb6ff58da5aa4538c4a2bbf70b717b172b3;p=thirdparty%2Fgit.git

Merge branch 'jc/push-to-checkout'

Extending the js/push-to-deploy topic, the behaviour of "git push"
when updating the working tree and the index with an update to the
branch that is checked out can be tweaked by push-to-checkout hook.

* jc/push-to-checkout:
  receive-pack: support push-to-checkout hook
  receive-pack: refactor updateInstead codepath
---

cba07bb6ff58da5aa4538c4a2bbf70b717b172b3