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)
commit6d5129ac098e8b9c270efd5fa2695163122a0a46
tree95e179100ed9877df930637ff244e9edaa462126
parent7bd1527d2d8c80a6e9a0f8583082a5aee5428c68
parent6d28644d691fa3967d24d988d51d863f22bbcc63
Merge branch 'fix' into maint

* fix:
  git-am: do not allow empty commits by mistake.