| commit | 980a3d3dd742d534b394b04e578c2de5e3ee4793 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Aug 2015 18:01:26 +0000 (3 11:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Aug 2015 18:01:27 +0000 (3 11:01 -0700) | ||
| tree | 1ccb2f6d9c0f64dbbb21eef6fc7a3a373176cae6 | treesnapshot (tar.gz zip) |
| parent | 461c119739389430e9f978426f25a12690a1831c | commitdiff |
| parent | 5b05b92d0322e392253c8cb6b96197b379d077ce | commitdiff |
Merge branch 'pt/am-tests'
* pt/am-tests:
t3901: test git-am encoding conversion
t3418: non-interactive rebase --continue with rerere enabled
t4150: tests for am --[no-]scissors
t4150: am with post-applypatch hook
t4150: am with pre-applypatch hook
t4150: am with applypatch-msg hook
t4150: am --resolved fails if index has unmerged entries
t4150: am --resolved fails if index has no changes
t4150: am refuses patches when paused
t4151: am --abort will keep dirty index intact
t4150: am fails if index is dirty
t4150: am.messageid really adds the message id
* pt/am-tests:
t3901: test git-am encoding conversion
t3418: non-interactive rebase --continue with rerere enabled
t4150: tests for am --[no-]scissors
t4150: am with post-applypatch hook
t4150: am with pre-applypatch hook
t4150: am with applypatch-msg hook
t4150: am --resolved fails if index has unmerged entries
t4150: am --resolved fails if index has no changes
t4150: am refuses patches when paused
t4151: am --abort will keep dirty index intact
t4150: am fails if index is dirty
t4150: am.messageid really adds the message id
| t/t4150-am.sh | diff1 | diff2 | blobhistory |