summaryrefslogtreecommitdiffstats
path: root/t/t4153-am-resume-override-opts.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/am-retry'Junio C Hamano2024-07-181-1/+1
|\
| * t4153: stop redirecting input from /dev/zeroJeff King2024-07-171-1/+1
* | Merge branch 'ps/leakfixes-more'Junio C Hamano2024-07-081-0/+1
|\ \ | |/ |/|
| * merge-recursive: fix leaking rename conflict infoPatrick Steinhardt2024-06-111-0/+1
* | am: add explicit "--retry" optionJeff King2024-06-061-5/+9
|/
* tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano2023-11-021-1/+1
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-111-1/+1
* t4153: fix negated test_i18ngrep callVasco Almeida2016-06-181-1/+1
* am: let --signoff override --no-signoffPaul Tan2015-08-121-0/+20
* am: let command-line options override saved optionsPaul Tan2015-08-121-0/+82