From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Jul 2012 20:04:39 +0000 (-0700)
Subject: Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint
X-Git-Tag: v1.7.11.4~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b67f560f473ec84c9ea77a1fa6378bc7cc29d9d;p=thirdparty%2Fgit.git

Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint

When "git am" failed, old timers knew to check .git/rebase-apply/patch
to see what went wrong, but we never told the users about it.

* pg/maint-1.7.9-am-where-is-patch:
  am: indicate where a failed patch is to be found
---

9b67f560f473ec84c9ea77a1fa6378bc7cc29d9d