summaryrefslogtreecommitdiff
path: root/t/t4151-am-abort.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ak/t4151-ls-files-could-be-empty'Junio C Hamano2016-05-171-1/+1
|\
| * t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-emptyArmin Kunaschik2016-05-091-1/+1
| * Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-031-0/+81
| |\
* | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexpt/am-builtin-abort-fixPaul Tan2015-08-191-0/+24
* | | t4151: am --abort will keep dirty index intactPaul Tan2015-07-201-0/+15
* | | Merge branch 'pt/am-abort-fix'Junio C Hamano2015-06-241-0/+81
|\ \ \ | |/ / |/| / | |/
| * am --abort: keep unrelated commits on unborn branchpt/am-abort-fixPaul Tan2015-06-081-0/+11
| * am --abort: support aborting to unborn branchPaul Tan2015-06-081-0/+17
| * am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-081-0/+23
| * am --skip: support skipping while on unborn branchPaul Tan2015-06-081-0/+10
| * am -3: support 3way merge on unborn branchPaul Tan2015-06-081-0/+9
| * am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-081-0/+11
* | t: fix some trivial cases of ignored exit codes in loopsJeff King2015-03-251-1/+1
|/
* i18n: git-am core say messagesÆvar Arnfjörð Bjarmason2011-05-211-2/+3
* am --abort: keep unrelated commits since the last failure and warnJunio C Hamano2010-12-211-0/+9
* MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-141-2/+2
* format-patch: autonumber by defaultBrian Gernhardt2008-10-181-1/+1
* tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-031-2/+2
* update test case to protect am --skip behaviourOlivier Marin2008-07-241-0/+2
* git-am: Add colon before the subject that is printed out as being appliedStephan Beyer2008-07-231-1/+1
* git am --skip: clean the index while preserving local changesOlivier Marin2008-07-221-2/+9
* git am --abortNanako Shiraishi2008-07-191-0/+56
View Lorry Controller Status