summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
Commit message (Expand)AuthorAgeFilesLines
* format-patch: add --mboxrd alias for --pretty=mboxrdEric Wong2022-11-141-1/+1
* tests: change "mkdir -p && write_script" to use "test_hook"Ævar Arnfjörð Bjarmason2022-03-171-18/+6
* i18n: factorize "invalid value" messagesJean-Noël Avila2022-02-041-1/+1
* Merge branch 'xw/am-empty'Junio C Hamano2022-01-051-0/+107
|\
| * am: support --allow-empty to record specific empty patches徐沛文 (Aleen)2021-12-151-0/+57
| * am: support --empty=<option> to handle empty patches徐沛文 (Aleen)2021-12-151-0/+50
* | tests: fix broken &&-chains in `{...}` groupsEric Sunshine2021-12-131-1/+1
|/
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-101-1/+1
* t4*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-14/+14
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* tests: avoid variations of the `master` branch nameJohannes Schindelin2020-09-261-4/+4
* Merge branch 'ma/test-quote-cleanup'Junio C Hamano2020-08-131-4/+4
|\
| * t: don't spuriously close and reopen quotesMartin Ågren2020-08-061-4/+4
* | apply: do not lazy fetch when applying binaryJonathan Tan2020-08-061-0/+16
|/
* t: fix whitespace around &&Andrei Rybak2020-03-221-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-031-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 --quitnd/am-quitNguyễn Thái Ngọc Duy2018-02-141-0/+12
|/
* am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-081-20/+63
* mailinfo: fix in-body header continuationslt/mailinfo-in-body-header-continuationLinus Torvalds2017-04-111-2/+4
* mailinfo: handle in-body header continuationsJonathan Tan2016-09-211-0/+23
* am: support --patch-format=mboxrdew/mboxrd-format-amEric Wong2016-06-061-0/+20
* Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-081-0/+48
|\
| * am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-061-0/+48
* | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-0/+36
|/
* git-am: add am.threeWay config variableRemi Lespinet2015-08-041-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 stdinpt/am-foreignPaul 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
View Lorry Controller Status