Code

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)
commitd0ab520a2599afdfd4d61894863984fc36842b12
treec80fb4883d6e608e112438e54106b983af4c70fa
parent464509f790f409d95e0820364ef7296d82942d8c
parent11dc4e70c33c2fbbff19014035d3bf624da1902c
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  git-am: minor cleanup
  Clarify and fix English in "git-rm" documentation
git-am.sh