Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Apr 2008 00:04:05 +0000 (17:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Apr 2008 00:04:05 +0000 (17:04 -0700)
* maint-1.5.4:
  git-am: minor cleanup
  Clarify and fix English in "git-rm" documentation

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge