summary refs log tree commit diff
path: root/t/t4151-am-abort.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-13tests: use test_write_lines() to generate line-oriented outputEric Sunshine1-8/+2
2021-09-10am: fix incorrect exit status on am fail to abortElijah Newren1-1/+1
2021-09-10t4151: add a few am --abort testsElijah Newren1-0/+39
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy1-2/+2
2018-02-12t4151: consolidate multiple calls to test_i18ngrepRamsay Jones1-3/+2
2016-05-17Merge branch 'ak/t4151-ls-files-could-be-empty'Junio C Hamano1-1/+1
2016-05-09t4151: make sure argument to 'test -z' is givenArmin Kunaschik1-1/+1
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan1-0/+24
2015-08-03Merge branch 'pt/am-abort-fix' into maintJunio C Hamano1-0/+81
2015-07-20t4151: am --abort will keep dirty index intactPaul Tan1-0/+15
2015-06-24Merge branch 'pt/am-abort-fix'Junio C Hamano1-0/+81
2015-06-08am --abort: keep unrelated commits on unborn branchPaul Tan1-0/+11
2015-06-08am --abort: support aborting to unborn branchPaul Tan1-0/+17
2015-06-08am --abort: revert changes introduced by failed 3way mergePaul Tan1-0/+23
2015-06-08am --skip: support skipping while on unborn branchPaul Tan1-0/+10
2015-06-08am -3: support 3way merge on unborn branchPaul Tan1-0/+9
2015-06-08am --skip: revert changes introduced by failed 3way mergePaul Tan1-0/+11
2015-03-25t: fix some trivial cases of ignored exit codes in loopsJeff King1-1/+1
2011-05-21i18n: git-am core say messagesÆvar Arnfjörð Bjarmason1-2/+3
2010-12-21am --abort: keep unrelated commits since the last failure and warnJunio C Hamano1-0/+9
2010-07-14MERGE_RR is in .git, not .git/rr-cacheJay Soffian1-2/+2
2008-10-18format-patch: autonumber by defaultBrian Gernhardt1-1/+1
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi1-2/+2
2008-07-24update test case to protect am --skip behaviourOlivier Marin1-0/+2
2008-07-23git-am: Add colon before the subject that is printed out as being appliedStephan Beyer1-1/+1
2008-07-22git am --skip: clean the index while preserving local changesOlivier Marin1-2/+9
2008-07-19git am --abortNanako Shiraishi1-0/+56
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-03 01:20:21 +0000