summaryrefslogtreecommitdiff
path: root/t/t4151-am-abort.sh
AgeCommit message (Expand)Author
2021-09-10am: fix incorrect exit status on am fail to abortElijah Newren
2021-09-10t4151: add a few am --abort testsElijah Newren
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy
2018-02-12t4151: consolidate multiple calls to test_i18ngrepRamsay Jones
2016-05-17Merge branch 'ak/t4151-ls-files-could-be-empty'Junio C Hamano
2016-05-09t4151: make sure argument to 'test -z' is givenArmin Kunaschik
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan
2015-08-03Merge branch 'pt/am-abort-fix' into maintJunio C Hamano
2015-07-20t4151: am --abort will keep dirty index intactPaul Tan
2015-06-24Merge branch 'pt/am-abort-fix'Junio C Hamano
2015-06-08am --abort: keep unrelated commits on unborn branchPaul Tan
2015-06-08am --abort: support aborting to unborn branchPaul Tan
2015-06-08am --abort: revert changes introduced by failed 3way mergePaul Tan
2015-06-08am --skip: support skipping while on unborn branchPaul Tan
2015-06-08am -3: support 3way merge on unborn branchPaul Tan
2015-06-08am --skip: revert changes introduced by failed 3way mergePaul Tan
2015-03-25t: fix some trivial cases of ignored exit codes in loopsJeff King
2011-05-21i18n: git-am core say messagesÆvar Arnfjörð Bjarmason
2010-12-21am --abort: keep unrelated commits since the last failure and warnJunio C Hamano
2010-07-14MERGE_RR is in .git, not .git/rr-cacheJay Soffian
2008-10-18format-patch: autonumber by defaultBrian Gernhardt
2008-09-03tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi
2008-07-25update test case to protect am --skip behaviourOlivier Marin
2008-07-23git-am: Add colon before the subject that is printed out as being appliedStephan Beyer
2008-07-22git am --skip: clean the index while preserving local changesOlivier Marin
2008-07-19git am --abortNanako Shiraishi