From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Feb 2008 00:04:37 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~261
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3023448cef6e85bdc1ce98226f23d63128c5c9a1;p=git.git

Merge branch 'maint'

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

3023448cef6e85bdc1ce98226f23d63128c5c9a1