diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:49:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:49:00 -0700 |
commit | 76689ab83b65636a01dd34ecfb9c1382aa6e959a (patch) | |
tree | a2ea05a87eb3cf47128e914e2bcd2467620de073 /string-list.h | |
parent | Merge branch 'rt/cherry-pick-continue-advice-in-status' (diff) | |
parent | t/am: use test_path_is_missing() where appropriate (diff) | |
download | tgif-76689ab83b65636a01dd34ecfb9c1382aa6e959a.tar.xz |
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
Diffstat (limited to 'string-list.h')
0 files changed, 0 insertions, 0 deletions