From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Dec 2010 21:42:55 +0000 (-0800)
Subject: Merge branch 'jc/maint-am-abort-safely' into maint
X-Git-Tag: v1.7.4-rc0~1^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f739695700e4a9d9de640ff623fe4e728f5b23a?ds=inline;hp=--cc

Merge branch 'jc/maint-am-abort-safely' into maint

* jc/maint-am-abort-safely:
am --abort: keep unrelated commits since the last failure and warn
---

2f739695700e4a9d9de640ff623fe4e728f5b23a