Merge branch 'fix' into maint
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 10:21:00 +0000 (02:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Feb 2006 10:21:00 +0000 (02:21 -0800)
* fix:
  git-am: do not allow empty commits by mistake.


Trivial merge