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)
* jc/rebase:
  rebase: allow a hook to refuse rebasing.


Trivial merge