summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
AgeCommit message (Expand)AuthorFilesLines
2026-07-06t: convert grep assertions to test_grepMichael Montalbo1-2/+2
2025-07-21pull: add pull.autoStash config optionLidong Yan1-0/+60
2025-05-16sequencer: make it clearer that commit descriptions are just commentsElijah Newren1-1/+1
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-08-01builtin/remote: fix various trivial memory leaksPatrick Steinhardt1-0/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-17/+17
2022-09-08fetch: add branch.*.merge to default ref-prefix extensionJeff King1-0/+17
2022-01-14pull --rebase: honor rebase.autostash when fast-forwardingPhilippe Blain1-0/+13
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-21/+3
2021-09-07tests: stop testing `git rebase --preserve-merges`Johannes Schindelin1-18/+0
2021-09-07t5520: do not use `pull.rebase=preserve`Johannes Schindelin1-3/+3
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren1-10/+10
2021-05-11test-lib functions: add --printf option to test_commitÆvar Arnfjörð Bjarmason1-8/+2
2020-11-19t55[23]*: adjust the references to the default branch name "main"Johannes Schindelin1-16/+16
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-05-20t5520: avoid alternation in grep's BRE (not POSIX)Carlo Marcelo Arenas Belón1-1/+1
2020-04-10pull: pass --autostash to mergeDenton Liu1-8/+35
2020-04-10t5520: make test_pull_autostash() accept expect_parent_numDenton Liu1-6/+8
2020-02-16rebase: rename the two primary rebase backendsElijah Newren1-1/+1
2020-02-16rebase: change the default backend from "am" to "merge"Elijah Newren1-4/+6
2020-02-16rebase tests: repeat some tests using the merge backend instead of amElijah Newren1-2/+15
2019-11-21t5520: replace `! git` with `test_must_fail git`Denton Liu1-2/+2
2019-11-21t5520: remove redundant lines in test casesDenton Liu1-8/+0
2019-11-21t5520: replace $(cat ...) comparison with test_cmpDenton Liu1-35/+70
2019-11-21t5520: don't put git in upstream of pipeDenton Liu1-1/+2
2019-11-21t5520: test single-line files by git with test_cmpDenton Liu1-16/+48
2019-11-21t5520: use test_cmp_rev where possibleDenton Liu1-25/+25
2019-11-21t5520: replace test -{n,z} with test-lib functionsDenton Liu1-4/+8
2019-11-21t5520: use test_line_count where possibleDenton Liu1-1/+2
2019-11-21t5520: remove spaces after redirect operatorDenton Liu1-5/+5
2019-11-21t5520: replace test -f with test-lib functionsDenton Liu1-5/+5
2019-11-21t5520: let sed open its own inputDenton Liu1-1/+1
2019-11-21t5520: use sq for test case namesDenton Liu1-2/+2
2019-11-21t5520: improve test styleDenton Liu1-42/+44
2018-11-02tests: optionally skip `git rebase -p` testsJohannes Schindelin1-2/+4
2018-08-17Merge branch 'js/pull-rebase-type-shorthand'Junio C Hamano1-0/+12
2018-08-06pull --rebase=<type>: allow single-letter abbreviations for the typeJohannes Schindelin1-0/+12
2018-07-11has_uncommitted_changes(): fall back to empty treeJeff King1-0/+12
2017-07-17rebase: make resolve message clearer for inexperienced usersWilliam Duclot1-2/+2
2017-06-01pull: ff --rebase --autostash works in dirty repoTyler Brazier1-0/+18
2016-12-19Merge branch 'jc/pull-rebase-ff'Junio C Hamano1-0/+17
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano1-0/+17
2016-08-12t5520: become resilient to GETTEXT_POISONVasco Almeida1-2/+2
2016-07-26t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin1-0/+32
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano1-1/+1
2016-06-17i18n: advice: internationalize message for conflictsVasco Almeida1-1/+1
2016-05-20pull: warn on --verify-signatures with --rebaseAlexander Hirsch1-0/+16
2016-04-04t5520: test --[no-]autostash with pull.rebase=trueMehul Jain1-0/+10
2016-04-04t5520: reduce commom lines of codeMehul Jain1-9/+7
2016-04-04t5520: factor out common "failing autostash" codeMehul Jain1-15/+11
generated by cgit (git 2.54.0.dirty) at 2026-09-13 06:34:59 +0000