Merge branch 'jc/push-to-checkout'
commitcba07bb6ff58da5aa4538c4a2bbf70b717b172b3
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:43:56 +0000 (11 13:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:43:56 +0000 (11 13:43 -0800)
tree9c81fde7d29150ab4c484a5078d88378f376874f
parent39fa6112ec8492f9300765e1f71e7c8ecfafc713
parent0855331941b723b227e93b33955bbe0b45025659
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
Documentation/config.txt
builtin/receive-pack.c