summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
AgeCommit message (Expand)AuthorFilesLines
2018-08-27Merge branch 'sg/test-must-be-empty'Libravatar Junio C Hamano1-2/+2
2018-08-21tests: use 'test_must_be_empty' instead of '! test -s'Libravatar SZEDER Gábor1-2/+2
2018-08-17Merge branch 'ar/t4150-am-scissors-test-fix'Libravatar Junio C Hamano1-19/+20
2018-08-06t4150: fix broken test for am --scissorsLibravatar Andrei Rybak1-19/+20
2018-05-14t: switch $_z40 to $ZERO_OIDLibravatar brian m. carlson1-2/+2
2018-03-06Merge branch 'nd/rebase-show-current-patch'Libravatar Junio C Hamano1-0/+5
2018-02-14am: support --quitLibravatar Nguyễn Thái Ngọc Duy1-0/+12
2018-02-12am: add --show-current-patchLibravatar Nguyễn Thái Ngọc Duy1-0/+5
2017-08-08am: fix signoff when other trailers are presentLibravatar Phillip Wood1-20/+63
2017-04-11mailinfo: fix in-body header continuationsLibravatar Linus Torvalds1-2/+4
2016-09-21mailinfo: handle in-body header continuationsLibravatar Jonathan Tan1-0/+23
2016-06-06am: support --patch-format=mboxrdLibravatar Eric Wong1-0/+20
2015-09-08Merge branch 'jc/builtin-am-signoff-regression-fix'Libravatar Junio C Hamano1-0/+48
2015-09-06am: match --signoff to the original scripted versionLibravatar Junio C Hamano1-0/+48
2015-09-01rerere: release lockfile in non-writing functionsLibravatar Jeff King1-0/+36
2015-08-04git-am: add am.threeWay config variableLibravatar Remi Lespinet1-0/+19
2015-08-03Merge branch 'pt/am-tests'Libravatar Junio C Hamano1-0/+217
2015-08-03Merge branch 'pt/am-foreign'Libravatar Junio C Hamano1-0/+82
2015-07-24Revert "git-am: add am.threeWay config variable"Libravatar Junio C Hamano1-19/+0
2015-07-20t4150: tests for am --[no-]scissorsLibravatar Paul Tan1-0/+48
2015-07-20t4150: am with post-applypatch hookLibravatar Paul Tan1-0/+38
2015-07-20t4150: am with pre-applypatch hookLibravatar Paul Tan1-0/+33
2015-07-20t4150: am with applypatch-msg hookLibravatar Paul Tan1-0/+35
2015-07-20t4150: am --resolved fails if index has unmerged entriesLibravatar Paul Tan1-0/+13
2015-07-20t4150: am --resolved fails if index has no changesLibravatar Paul Tan1-0/+12
2015-07-20t4150: am refuses patches when pausedLibravatar Paul Tan1-0/+14
2015-07-20t4150: am fails if index is dirtyLibravatar Paul Tan1-0/+12
2015-07-07t4150: am.messageid really adds the message idLibravatar Paul Tan1-0/+12
2015-06-15am: teach mercurial patch parser how to read from stdinLibravatar Paul Tan1-0/+10
2015-06-15am: use gmtime() to parse mercurial patch dateLibravatar Paul Tan1-0/+23
2015-06-15t4150: test applying StGit seriesLibravatar Paul Tan1-0/+17
2015-06-15am: teach StGit patch parser how to read from stdinLibravatar Paul Tan1-0/+10
2015-06-08t4150: test applying StGit patchLibravatar Paul Tan1-0/+22
2015-06-04git-am: add am.threeWay config variableLibravatar Remi Lespinet1-0/+19
2015-06-04t4150-am: refactor am -3 testsLibravatar Remi Lespinet1-15/+11
2014-11-25git-am: add --message-id/--no-message-idLibravatar Paolo Bonzini1-0/+23
2013-06-17t/am: use test_path_is_missing() where appropriateLibravatar Ramkumar Ramachandra1-17/+17
2013-06-17am: handle stray $dotest directoryLibravatar Ramkumar Ramachandra1-0/+6
2013-03-22apply --whitespace=fix: avoid running over the postimage bufferLibravatar Junio C Hamano1-1/+1
2012-04-14test: am of empty patch should not succeedLibravatar Jonathan Nieder1-1/+1
2012-04-14test: use test_i18ncmp for "Patch format detection failed" messageLibravatar Jonathan Nieder1-1/+1
2012-03-04Merge branch 'jc/am-3-nonstandard-popt'Libravatar Junio C Hamano1-0/+15
2012-02-26test: "am -3" can accept non-standard -p<num>Libravatar Junio C Hamano1-0/+15
2012-02-26Merge branch 'maint'Libravatar Junio C Hamano1-0/+10
2012-02-26Sync with 1.7.8.5Libravatar Junio C Hamano1-0/+10
2012-02-26am: don't infloop for an empty input fileLibravatar Jim Meyering1-0/+10
2012-02-13Sync with maintLibravatar Junio C Hamano1-1/+1
2012-02-13t: use sane_unset instead of unsetLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2012-01-29Merge branch 'tr/maint-mailinfo'Libravatar Junio C Hamano1-2/+12
2012-01-16mailinfo: with -b, keep space after [foo]Libravatar Thomas Rast1-1/+1