Merge branch 'maint'
commit3023448cef6e85bdc1ce98226f23d63128c5c9a1
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2008 00:04:37 +0000 (3 16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2008 00:04:37 +0000 (3 16:04 -0800)
tree3a276a9a3d211096fe2f096b1d225eeb4b215be7
parent147402a2e9e29efe3fe75b5409cc2dd88cef04c7
parent5ea55edb68f488fad76c007472830cc649e3d320
Merge branch 'maint'

* maint:
  git-remote documentation: fix synopsis to match description
  git-am: fix type in its usage string