summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
AgeCommit message (Expand)AuthorFilesLines
2022-01-05Merge branch 'xw/am-empty'Libravatar Junio C Hamano1-0/+107
2021-12-15am: support --allow-empty to record specific empty patchesLibravatar 徐沛文 (Aleen)1-0/+57
2021-12-15am: support --empty=<option> to handle empty patchesLibravatar 徐沛文 (Aleen)1-0/+50
2021-12-13tests: fix broken &&-chains in `{...}` groupsLibravatar Eric Sunshine1-1/+1
2021-02-10tests: remove most uses of test_i18ncmpLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2020-11-19t4*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-14/+14
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-09-26tests: avoid variations of the `master` branch nameLibravatar Johannes Schindelin1-4/+4
2020-08-13Merge branch 'ma/test-quote-cleanup'Libravatar Junio C Hamano1-4/+4
2020-08-06t: don't spuriously close and reopen quotesLibravatar Martin Ågren1-4/+4
2020-08-06apply: do not lazy fetch when applying binaryLibravatar Jonathan Tan1-0/+16
2020-03-22t: fix whitespace around &&Libravatar Andrei Rybak1-1/+1
2020-02-20am: support --show-current-patch=diff to retrieve .git/rebase-apply/patchLibravatar Paolo Bonzini1-0/+10
2020-02-20am: support --show-current-patch=raw as a synonym for--show-current-patchLibravatar Paolo Bonzini1-0/+10
2019-09-03am: reload .gitattributes after patching itLibravatar brian m. carlson1-0/+52
2019-03-13t4150: remove unused variableLibravatar Andrei Rybak1-3/+1
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