Merge branch 'maint-1.6.6' into maint
commit507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:24:25 +0000 (4 22:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:24:25 +0000 (4 22:24 -0800)
treec560c1c650fdc71a911cd7318d614f1441692d23
parent511da22ecfb325bb693c0877e2a0d35fdba69a90
parente8a285e553f8c6c04820a542b2a28816a9d62d3c
Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
  Remove extra '-' from git-am(1)
Documentation/git-am.txt