summaryrefslogtreecommitdiffstats
path: root/t/t4150-am.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: fix whitespace around &&Andrei Rybak2020-03-231-1/+1
* am: support --show-current-patch=diff to retrieve .git/rebase-apply/patchPaolo Bonzini2020-02-201-0/+10
* am: support --show-current-patch=raw as a synonym for--show-current-patchPaolo Bonzini2020-02-201-0/+10
* am: reload .gitattributes after patching itbrian m. carlson2019-09-041-0/+52
* t4150: remove unused variableAndrei Rybak2019-03-131-3/+1
* Merge branch 'sg/test-must-be-empty'Junio C Hamano2018-08-271-2/+2
|\
| * tests: use 'test_must_be_empty' instead of '! test -s'SZEDER Gábor2018-08-211-2/+2
* | Merge branch 'ar/t4150-am-scissors-test-fix'Junio C Hamano2018-08-171-19/+20
|\ \ | |/ |/|
| * t4150: fix broken test for am --scissorsAndrei Rybak2018-08-061-19/+20
* | t: switch $_z40 to $ZERO_OIDbrian m. carlson2018-05-141-2/+2
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-0/+5
|\ \
| * | am: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+5
| |/
* / am: support --quitNguyễn Thái Ngọc Duy2018-02-141-0/+12
|/
* am: fix signoff when other trailers are presentPhillip Wood2017-08-081-20/+63
* mailinfo: fix in-body header continuationsLinus Torvalds2017-04-111-2/+4
* mailinfo: handle in-body header continuationsJonathan Tan2016-09-211-0/+23
* am: support --patch-format=mboxrdEric Wong2016-06-061-0/+20
* Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-091-0/+48
|\
| * am: match --signoff to the original scripted versionJunio C Hamano2015-09-071-0/+48
* | rerere: release lockfile in non-writing functionsJeff King2015-09-021-0/+36
|/
* git-am: add am.threeWay config variableRemi Lespinet2015-08-051-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 stdinPaul 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 variableRemi Lespinet2015-06-041-0/+19
* | t4150-am: refactor am -3 testsRemi Lespinet2015-06-041-15/+11
|/
* git-am: add --message-id/--no-message-idPaolo Bonzini2014-11-261-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-151-1/+1
* test: use test_i18ncmp for "Patch format detection failed" messageJonathan Nieder2012-04-151-1/+1
* Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2012-03-051-0/+15
|\
| * test: "am -3" can accept non-standard -p<num>Junio C Hamano2012-02-271-0/+15
* | Merge branch 'maint'Junio C Hamano2012-02-271-0/+10
|\ \
| * \ Sync with 1.7.8.5Junio C Hamano2012-02-271-0/+10
| |\ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 00:17:42 +0100