author | Junio C Hamano <gitster@pobox.com> | |
Tue, 28 Dec 2010 21:42:55 +0000 (13:42 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 28 Dec 2010 21:42:55 +0000 (13:42 -0800) | ||
commit | 2f739695700e4a9d9de640ff623fe4e728f5b23a | |
tree | b6f76121a20097d66a8d55f158f5e3a0dc2cecd3 | tree | snapshot |
parent | 0ec9ee3bcf5c926df9d54f63ff3ed8b97e19bb0d | commit | diff |
parent | 7b3b7e37581fb5266a260687c21af1571b4ade81 | commit | diff |
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
* jc/maint-am-abort-safely:
am --abort: keep unrelated commits since the last failure and warn