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)
commit56c155aa9f45fc4a40ee693a4f5521f8b7568df0
tree940688d15a33f80e325ba5cfcf1999a062ea245e
parentadeb25cf04a33ce8a03dd698121bffcabf8682ad
parent0080f50eb333192617739c9954a30611cc0adeaa
Merge branch 'master' into next

* master:
  git-commit --amend: two fixes.