aboutsummaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
Commit message (Expand)AuthorAge
* Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-08
|\
| * am: match --signoff to the original scripted versionJunio C Hamano2015-09-06
* | rerere: release lockfile in non-writing functionsJeff King2015-09-01
|/
* git-am: add am.threeWay config variableRemi Lespinet2015-08-04
* Merge branch 'pt/am-tests'Junio C Hamano2015-08-03
|\
| * t4150: tests for am --[no-]scissorsPaul Tan2015-07-20
| * t4150: am with post-applypatch hookPaul Tan2015-07-20
| * t4150: am with pre-applypatch hookPaul Tan2015-07-20
| * t4150: am with applypatch-msg hookPaul Tan2015-07-20
| * t4150: am --resolved fails if index has unmerged entriesPaul Tan2015-07-20
| * t4150: am --resolved fails if index has no changesPaul Tan2015-07-20
| * t4150: am refuses patches when pausedPaul Tan2015-07-20
| * t4150: am fails if index is dirtyPaul Tan2015-07-20
| * t4150: am.messageid really adds the message idPaul Tan2015-07-07
* | Merge branch 'pt/am-foreign'Junio C Hamano2015-08-03
|\ \
| * | am: teach mercurial patch parser how to read from stdinPaul Tan2015-06-15
| * | am: use gmtime() to parse mercurial patch datePaul Tan2015-06-15
| * | t4150: test applying StGit seriesPaul Tan2015-06-15
| * | am: teach StGit patch parser how to read from stdinPaul Tan2015-06-15
| * | t4150: test applying StGit patchPaul Tan2015-06-08
* | | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-24
| |/ |/|
* | git-am: add am.threeWay config variableRemi Lespinet2015-06-04
* | t4150-am: refactor am -3 testsRemi Lespinet2015-06-04
|/
* git-am: add --message-id/--no-message-idPaolo Bonzini2014-11-25
* t/am: use test_path_is_missing() where appropriateRamkumar Ramachandra2013-06-17
* am: handle stray $dotest directoryRamkumar Ramachandra2013-06-17
* apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-22
* test: am of empty patch should not succeedJonathan Nieder2012-04-14
* test: use test_i18ncmp for "Patch format detection failed" messageJonathan Nieder2012-04-14
* Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2012-03-04
|\
| * test: "am -3" can accept non-standard -p<num>Junio C Hamano2012-02-26
* | Merge branch 'maint'Junio C Hamano2012-02-26
|\ \
| * \ Sync with 1.7.8.5Junio C Hamano2012-02-26
| |\ \
| | * | am: don't infloop for an empty input fileJim Meyering2012-02-26
| | |/
* | | Sync with maintJunio C Hamano2012-02-13
|\ \ \ | |/ /
| * | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-13
| |/
* | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-29
|\ \ | |/ |/|
| * mailinfo: with -b, keep space after [foo]Thomas Rast2012-01-16
| * am: learn passing -b to mailinfoThomas Rast2012-01-16
* | am: ignore leading whitespace before patchDavid Barr2011-08-11
* | i18n: git-am core say messagesÆvar Arnfjörð Bjarmason2011-05-21
|/
* tests: add missing &&Jonathan Nieder2010-11-09
* Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-23
* t4150 (am): futureproof against failing testsJonathan Nieder2010-07-23
* t4150 (am): style fixJonathan Nieder2010-07-23
* fix portability issues with $ in double quotesStephen Boyd2010-01-26
* am: fix patch format detection for Thunderbird "Save As" emailsStephen Boyd2010-01-25
* am: allow individual e-mail files as inputJunio C Hamano2009-08-06
* am, rebase: teach quiet optionStephen Boyd2009-06-18
* t4150: test applying with a newline in subjectStephen Boyd2009-06-18