| Commit message (Expand) | Author | Age | Files | Lines |
* | mailinfo: handle in-body header continuations | Jonathan Tan | 2016-09-21 | 1 | -0/+23 |
* | am: support --patch-format=mboxrdew/mboxrd-format-am | Eric Wong | 2016-06-06 | 1 | -0/+20 |
* | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 | 1 | -0/+48 |
|\ |
|
| * | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fix | Junio C Hamano | 2015-09-06 | 1 | -0/+48 |
* | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fix | Jeff King | 2015-09-01 | 1 | -0/+36 |
|/ |
|
* | git-am: add am.threeWay config variable | Remi Lespinet | 2015-08-04 | 1 | -0/+19 |
* | Merge branch 'pt/am-tests' | Junio C Hamano | 2015-08-03 | 1 | -0/+217 |
|\ |
|
| * | t4150: tests for am --[no-]scissors | Paul Tan | 2015-07-20 | 1 | -0/+48 |
| * | t4150: am with post-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+38 |
| * | t4150: am with pre-applypatch hook | Paul Tan | 2015-07-20 | 1 | -0/+33 |
| * | t4150: am with applypatch-msg hook | Paul Tan | 2015-07-20 | 1 | -0/+35 |
| * | t4150: am --resolved fails if index has unmerged entries | Paul Tan | 2015-07-20 | 1 | -0/+13 |
| * | t4150: am --resolved fails if index has no changes | Paul Tan | 2015-07-20 | 1 | -0/+12 |
| * | t4150: am refuses patches when paused | Paul Tan | 2015-07-20 | 1 | -0/+14 |
| * | t4150: am fails if index is dirty | Paul Tan | 2015-07-20 | 1 | -0/+12 |
| * | t4150: am.messageid really adds the message id | Paul Tan | 2015-07-07 | 1 | -0/+12 |
* | | Merge branch 'pt/am-foreign' | Junio C Hamano | 2015-08-03 | 1 | -0/+82 |
|\ \ |
|
| * | | am: teach mercurial patch parser how to read from stdinpt/am-foreign | Paul Tan | 2015-06-15 | 1 | -0/+10 |
| * | | am: use gmtime() to parse mercurial patch date | Paul Tan | 2015-06-15 | 1 | -0/+23 |
| * | | t4150: test applying StGit series | Paul Tan | 2015-06-15 | 1 | -0/+17 |
| * | | am: teach StGit patch parser how to read from stdin | Paul Tan | 2015-06-15 | 1 | -0/+10 |
| * | | t4150: test applying StGit patch | Paul Tan | 2015-06-08 | 1 | -0/+22 |
* | | | Revert "git-am: add am.threeWay config variable" | Junio C Hamano | 2015-07-24 | 1 | -19/+0 |
| |/
|/| |
|
* | | git-am: add am.threeWay config variablerl/am-3way-config | Remi Lespinet | 2015-06-04 | 1 | -0/+19 |
* | | t4150-am: refactor am -3 tests | Remi Lespinet | 2015-06-04 | 1 | -15/+11 |
|/ |
|
* | git-am: add --message-id/--no-message-idpb/am-message-id-footer | Paolo Bonzini | 2014-11-25 | 1 | -0/+23 |
* | t/am: use test_path_is_missing() where appropriate | Ramkumar Ramachandra | 2013-06-17 | 1 | -17/+17 |
* | am: handle stray $dotest directory | Ramkumar Ramachandra | 2013-06-17 | 1 | -0/+6 |
* | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 2013-03-22 | 1 | -1/+1 |
* | test: am of empty patch should not succeed | Jonathan Nieder | 2012-04-14 | 1 | -1/+1 |
* | test: use test_i18ncmp for "Patch format detection failed" message | Jonathan Nieder | 2012-04-14 | 1 | -1/+1 |
* | Merge branch 'jc/am-3-nonstandard-popt' | Junio C Hamano | 2012-03-04 | 1 | -0/+15 |
|\ |
|
| * | test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-popt | Junio C Hamano | 2012-02-26 | 1 | -0/+15 |
* | | Merge branch 'maint' | Junio C Hamano | 2012-02-26 | 1 | -0/+10 |
|\ \ |
|
| * \ | Sync with 1.7.8.5 | Junio C Hamano | 2012-02-26 | 1 | -0/+10 |
| |\ \ |
|
| | * | | am: don't infloop for an empty input file | Jim Meyering | 2012-02-26 | 1 | -0/+10 |
| | |/ |
|
* | | | Sync with maint | Junio C Hamano | 2012-02-13 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | t: use sane_unset instead of unset | Ævar Arnfjörð Bjarmason | 2012-02-13 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'tr/maint-mailinfo' | Junio C Hamano | 2012-01-29 | 1 | -2/+12 |
|\ \
| |/
|/| |
|
| * | mailinfo: with -b, keep space after [foo]tr/maint-mailinfo | Thomas Rast | 2012-01-16 | 1 | -1/+1 |
| * | am: learn passing -b to mailinfo | Thomas Rast | 2012-01-16 | 1 | -2/+12 |
* | | am: ignore leading whitespace before patch | David Barr | 2011-08-11 | 1 | -0/+18 |
* | | i18n: git-am core say messages | Ævar Arnfjörð Bjarmason | 2011-05-21 | 1 | -1/+1 |
|/ |
|
* | tests: add missing && | Jonathan Nieder | 2010-11-09 | 1 | -1/+1 |
* | Teach "apply --index-info" to handle rename patches | Junio C Hamano | 2010-07-23 | 1 | -0/+46 |
* | t4150 (am): futureproof against failing tests | Jonathan Nieder | 2010-07-23 | 1 | -1/+47 |
* | t4150 (am): style fix | Jonathan Nieder | 2010-07-23 | 1 | -108/+132 |
* | fix portability issues with $ in double quotes | Stephen Boyd | 2010-01-26 | 1 | -3/+3 |
* | am: fix patch format detection for Thunderbird "Save As" emails | Stephen Boyd | 2010-01-25 | 1 | -0/+15 |
* | am: allow individual e-mail files as input | Junio C Hamano | 2009-08-06 | 1 | -0/+15 |