From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:56 +0000 (-0700)
Subject: Merge branch 'rr/am-help'
X-Git-Tag: v1.7.2-rc0~47
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b8063cef3933c25288f2ab78d2adf1a4a2149ce;p=git.git

Merge branch 'rr/am-help'

* rr/am-help:
  git am: Remove stray error message from sed
  git am: Display some help text when patch is empty
  git am: Set cmdline globally
---

8b8063cef3933c25288f2ab78d2adf1a4a2149ce