| commit | 76689ab83b65636a01dd34ecfb9c1382aa6e959a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Jun 2013 20:49:00 +0000 (24 13:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Jun 2013 20:49:00 +0000 (24 13:49 -0700) | ||
| tree | a2ea05a87eb3cf47128e914e2bcd2467620de073 | treesnapshot (tar.gz zip) |
| parent | 001d1160541a6dcfceb82a0a900478e315a129eb | commitdiff |
| parent | 61e0eb9de268cab90ea2563957b4c74c77e82b48 | commitdiff |
Merge branch 'rr/am-quit-empty-then-abort-fix'
Recent "rebase --autostash" update made it impossible to recover
with "git am --abort" from a repository where "git am" without mbox
was run by mistake and then was killed with "^C".
* rr/am-quit-empty-then-abort-fix:
t/am: use test_path_is_missing() where appropriate
am: handle stray $dotest directory
Recent "rebase --autostash" update made it impossible to recover
with "git am --abort" from a repository where "git am" without mbox
was run by mistake and then was killed with "^C".
* rr/am-quit-empty-then-abort-fix:
t/am: use test_path_is_missing() where appropriate
am: handle stray $dotest directory