aboutsummaryrefslogtreecommitdiff
path: root/t/t4151-am-abort.sh
Commit message (Expand)AuthorAge
* am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan2015-08-19
* t4151: am --abort will keep dirty index intactPaul Tan2015-07-20
* Merge branch 'pt/am-abort-fix'Junio C Hamano2015-06-24
|\
| * am --abort: keep unrelated commits on unborn branchPaul Tan2015-06-08
| * am --abort: support aborting to unborn branchPaul Tan2015-06-08
| * am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-08
| * am --skip: support skipping while on unborn branchPaul Tan2015-06-08
| * am -3: support 3way merge on unborn branchPaul Tan2015-06-08
| * am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-08
* | t: fix some trivial cases of ignored exit codes in loopsJeff King2015-03-25
|/
* i18n: git-am core say messagesÆvar Arnfjörð Bjarmason2011-05-21
* am --abort: keep unrelated commits since the last failure and warnJunio C Hamano2010-12-21
* MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-14
* format-patch: autonumber by defaultBrian Gernhardt2008-10-18
* tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-03
* update test case to protect am --skip behaviourOlivier Marin2008-07-24
* git-am: Add colon before the subject that is printed out as being appliedStephan Beyer2008-07-23
* git am --skip: clean the index while preserving local changesOlivier Marin2008-07-22
* git am --abortNanako Shiraishi2008-07-19