Merge branch 'wk/doc-pre-rebase' into next
commita6ec310618c195c57dc06c9e9a0612deed9328da
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 18:33:08 +0000 (25 10:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 18:33:08 +0000 (25 10:33 -0800)
treed9081e67f7b89e692ce0c77a55eafad66834e863
parentf5f767cb2915833423ae4f19f8b7bb68d0ab29e6
parent0414acc3651a8e3ad938336b596e3de85e5d5d33
Merge branch 'wk/doc-pre-rebase' into next

* wk/doc-pre-rebase:
  Documentation/githooks: Explain pre-rebase parameters
Documentation/githooks.txt