Merge branch 'jc/rebase'
authorJunio C Hamano <junkio@cox.net>
Mon, 13 Feb 2006 10:38:16 +0000 (02:38 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 13 Feb 2006 10:38:16 +0000 (02:38 -0800)
* jc/rebase:
  rebase: allow a hook to refuse rebasing.


Trivial merge