summaryrefslogtreecommitdiff
path: root/t/t4151-am-abort.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-13tests: use test_write_lines() to generate line-oriented outputLibravatar Eric Sunshine1-8/+2
2021-09-10am: fix incorrect exit status on am fail to abortLibravatar Elijah Newren1-1/+1
2021-09-10t4151: add a few am --abort testsLibravatar Elijah Newren1-0/+39
2018-03-27t/helper: merge test-chmtime into test-toolLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-02-12t4151: consolidate multiple calls to test_i18ngrepLibravatar Ramsay Jones1-3/+2
2016-05-17Merge branch 'ak/t4151-ls-files-could-be-empty'Libravatar Junio C Hamano1-1/+1
2016-05-09t4151: make sure argument to 'test -z' is givenLibravatar Armin Kunaschik1-1/+1
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexLibravatar Paul Tan1-0/+24
2015-08-03Merge branch 'pt/am-abort-fix' into maintLibravatar Junio C Hamano1-0/+81
2015-07-20t4151: am --abort will keep dirty index intactLibravatar Paul Tan1-0/+15
2015-06-24Merge branch 'pt/am-abort-fix'Libravatar Junio C Hamano1-0/+81
2015-06-08am --abort: keep unrelated commits on unborn branchLibravatar Paul Tan1-0/+11
2015-06-08am --abort: support aborting to unborn branchLibravatar Paul Tan1-0/+17
2015-06-08am --abort: revert changes introduced by failed 3way mergeLibravatar Paul Tan1-0/+23
2015-06-08am --skip: support skipping while on unborn branchLibravatar Paul Tan1-0/+10
2015-06-08am -3: support 3way merge on unborn branchLibravatar Paul Tan1-0/+9
2015-06-08am --skip: revert changes introduced by failed 3way mergeLibravatar Paul Tan1-0/+11
2015-03-25t: fix some trivial cases of ignored exit codes in loopsLibravatar Jeff King1-1/+1
2011-05-21i18n: git-am core say messagesLibravatar Ævar Arnfjörð Bjarmason1-2/+3
2010-12-21am --abort: keep unrelated commits since the last failure and warnLibravatar Junio C Hamano1-0/+9
2010-07-14MERGE_RR is in .git, not .git/rr-cacheLibravatar Jay Soffian1-2/+2
2008-10-18format-patch: autonumber by defaultLibravatar Brian Gernhardt1-1/+1
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Libravatar Nanako Shiraishi1-2/+2
2008-07-24update test case to protect am --skip behaviourLibravatar Olivier Marin1-0/+2
2008-07-23git-am: Add colon before the subject that is printed out as being appliedLibravatar Stephan Beyer1-1/+1
2008-07-22git am --skip: clean the index while preserving local changesLibravatar Olivier Marin1-2/+9
2008-07-19git am --abortLibravatar Nanako Shiraishi1-0/+56
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 15:55:33 +0000