Merge branch 'wk/doc-pre-rebase'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:14:05 +0000 (12:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:14:05 +0000 (12:14 -0700)
* wk/doc-pre-rebase:
Documentation/githooks: Explain pre-rebase parameters

1  2 
Documentation/githooks.txt
Simple merge