Merge branch 'wk/doc-pre-rebase'
commitf944ec9aa53d22fb1d2f4e0b2974eb90c0cf3a15
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:14:05 +0000 (19 12:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:14:05 +0000 (19 12:14 -0700)
tree0042a6a266598a7d5001f3e4a04e1fea62c9df75
parent3e1b08bbf58173df80895af3bf86d14c77efe877
parent0414acc3651a8e3ad938336b596e3de85e5d5d33
Merge branch 'wk/doc-pre-rebase'

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