![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800) | ||
| commit | 81602bc6488fb96b056e7dbd0840af1607de5179 | |
| tree | 552d7266759f13355587e86091815b3cf4dcdd6e | tree | snapshot |
| parent | 7785c319da93a518e9bec91ab64a519c5d184a0c | commit | diff |
| parent | 7b3b7e37581fb5266a260687c21af1571b4ade81 | commit | diff |
Merge branch 'jc/maint-am-abort-safely' into next
* jc/maint-am-abort-safely:
am --abort: keep unrelated commits since the last failure and warn
* jc/maint-am-abort-safely:
am --abort: keep unrelated commits since the last failure and warn
| git-am.sh | diff1 | | diff2 | | blob | history |