Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 09:53:03 +0000 (02:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 09:53:03 +0000 (02:53 -0700)
* master:
  git-commit --amend: two fixes.


Trivial merge