Merge branch 'jc/rebase'
authorJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 01:49:00 +0000 (17:49 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 01:49:00 +0000 (17:49 -0800)
commit9b6c66e05cc26cc5f688b0e700ee0cb151fc6c09
tree3c615802aa38b2ec385353b75643374a53e38d3c
parent709fb393ca839f4c3fe0c65133d1aac54e8bf5f1
parent9a111c91b01455ee1ea9f33c60da7ad50d460a7b
Merge branch 'jc/rebase'

* jc/rebase:
  rebase: allow a hook to refuse rebasing.