summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
Commit message (Expand)AuthorAgeFilesLines
* am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-081-20/+63
* mailinfo: fix in-body header continuationslt/mailinfo-in-body-header-continuationLinus Torvalds2017-04-111-2/+4
* mailinfo: handle in-body header continuationsJonathan Tan2016-09-211-0/+23
* am: support --patch-format=mboxrdew/mboxrd-format-amEric Wong2016-06-061-0/+20
* Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-081-0/+48
|\
| * am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-061-0/+48
* | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-0/+36
|/
* git-am: add am.threeWay config variableRemi Lespinet2015-08-041-0/+19
* Merge branch 'pt/am-tests'Junio C Hamano2015-08-031-0/+217
|\
| * t4150: tests for am --[no-]scissorsPaul Tan2015-07-201-0/+48
| * t4150: am with post-applypatch hookPaul Tan2015-07-201-0/+38
| * t4150: am with pre-applypatch hookPaul Tan2015-07-201-0/+33
| * t4150: am with applypatch-msg hookPaul Tan2015-07-201-0/+35
| * t4150: am --resolved fails if index has unmerged entriesPaul Tan2015-07-201-0/+13
| * t4150: am --resolved fails if index has no changesPaul Tan2015-07-201-0/+12
| * t4150: am refuses patches when pausedPaul Tan2015-07-201-0/+14
| * t4150: am fails if index is dirtyPaul Tan2015-07-201-0/+12
| * t4150: am.messageid really adds the message idPaul Tan2015-07-071-0/+12
* | Merge branch 'pt/am-foreign'Junio C Hamano2015-08-031-0/+82
|\ \
| * | am: teach mercurial patch parser how to read from stdinpt/am-foreignPaul Tan2015-06-151-0/+10
| * | am: use gmtime() to parse mercurial patch datePaul Tan2015-06-151-0/+23
| * | t4150: test applying StGit seriesPaul Tan2015-06-151-0/+17
| * | am: teach StGit patch parser how to read from stdinPaul Tan2015-06-151-0/+10
| * | t4150: test applying StGit patchPaul Tan2015-06-081-0/+22
* | | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-241-19/+0
| |/ |/|
* | git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-041-0/+19
* | t4150-am: refactor am -3 testsRemi Lespinet2015-06-041-15/+11
|/
* git-am: add --message-id/--no-message-idpb/am-message-id-footerPaolo Bonzini2014-11-251-0/+23
* t/am: use test_path_is_missing() where appropriateRamkumar Ramachandra2013-06-171-17/+17
* am: handle stray $dotest directoryRamkumar Ramachandra2013-06-171-0/+6
* apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-221-1/+1
* test: am of empty patch should not succeedJonathan Nieder2012-04-141-1/+1
* test: use test_i18ncmp for "Patch format detection failed" messageJonathan Nieder2012-04-141-1/+1
* Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2012-03-041-0/+15
|\
| * test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-poptJunio C Hamano2012-02-261-0/+15
* | Merge branch 'maint'Junio C Hamano2012-02-261-0/+10
|\ \
| * \ Sync with 1.7.8.5Junio C Hamano2012-02-261-0/+10
| |\ \
| | * | am: don't infloop for an empty input fileJim Meyering2012-02-261-0/+10
| | |/
* | | Sync with maintJunio C Hamano2012-02-131-1/+1
|\ \ \ | |/ /
| * | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-131-1/+1
| |/
* | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-291-2/+12
|\ \ | |/ |/|
| * mailinfo: with -b, keep space after [foo]tr/maint-mailinfoThomas Rast2012-01-161-1/+1
| * am: learn passing -b to mailinfoThomas Rast2012-01-161-2/+12
* | am: ignore leading whitespace before patchDavid Barr2011-08-111-0/+18
* | i18n: git-am core say messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
|/
* tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-231-0/+46
* t4150 (am): futureproof against failing testsJonathan Nieder2010-07-231-1/+47
* t4150 (am): style fixJonathan Nieder2010-07-231-108/+132
* fix portability issues with $ in double quotesStephen Boyd2010-01-261-3/+3
View Lorry Controller Status