summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
AgeCommit message (Expand)AuthorFilesLines
2021-10-18Merge branch 'js/retire-preserve-merges'Libravatar Junio C Hamano1-21/+3
2021-09-07tests: stop testing `git rebase --preserve-merges`Libravatar Johannes Schindelin1-18/+0
2021-09-07t5520: do not use `pull.rebase=preserve`Libravatar Johannes Schindelin1-3/+3
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-10/+10
2021-05-11test-lib functions: add --printf option to test_commitLibravatar Ævar Arnfjörð Bjarmason1-8/+2
2020-11-19t55[23]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-16/+16
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-05-20t5520: avoid alternation in grep's BRE (not POSIX)Libravatar Carlo Marcelo Arenas Belón1-1/+1
2020-04-10pull: pass --autostash to mergeLibravatar Denton Liu1-8/+35
2020-04-10t5520: make test_pull_autostash() accept expect_parent_numLibravatar Denton Liu1-6/+8
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren1-1/+1
2020-02-16rebase: change the default backend from "am" to "merge"Libravatar Elijah Newren1-4/+6
2020-02-16rebase tests: repeat some tests using the merge backend instead of amLibravatar Elijah Newren1-2/+15
2019-11-21t5520: replace `! git` with `test_must_fail git`Libravatar Denton Liu1-2/+2
2019-11-21t5520: remove redundant lines in test casesLibravatar Denton Liu1-8/+0
2019-11-21t5520: replace $(cat ...) comparison with test_cmpLibravatar Denton Liu1-35/+70
2019-11-21t5520: don't put git in upstream of pipeLibravatar Denton Liu1-1/+2
2019-11-21t5520: test single-line files by git with test_cmpLibravatar Denton Liu1-16/+48
2019-11-21t5520: use test_cmp_rev where possibleLibravatar Denton Liu1-25/+25
2019-11-21t5520: replace test -{n,z} with test-lib functionsLibravatar Denton Liu1-4/+8
2019-11-21t5520: use test_line_count where possibleLibravatar Denton Liu1-1/+2
2019-11-21t5520: remove spaces after redirect operatorLibravatar Denton Liu1-5/+5
2019-11-21t5520: replace test -f with test-lib functionsLibravatar Denton Liu1-5/+5
2019-11-21t5520: let sed open its own inputLibravatar Denton Liu1-1/+1
2019-11-21t5520: use sq for test case namesLibravatar Denton Liu1-2/+2
2019-11-21t5520: improve test styleLibravatar Denton Liu1-43/+45
2018-11-02tests: optionally skip `git rebase -p` testsLibravatar Johannes Schindelin1-2/+4
2018-08-17Merge branch 'js/pull-rebase-type-shorthand'Libravatar Junio C Hamano1-0/+12
2018-08-06pull --rebase=<type>: allow single-letter abbreviations for the typeLibravatar Johannes Schindelin1-0/+12
2018-07-11has_uncommitted_changes(): fall back to empty treeLibravatar Jeff King1-0/+12
2017-07-17rebase: make resolve message clearer for inexperienced usersLibravatar William Duclot1-2/+2
2017-06-01pull: ff --rebase --autostash works in dirty repoLibravatar Tyler Brazier1-0/+18
2016-12-19Merge branch 'jc/pull-rebase-ff'Libravatar Junio C Hamano1-0/+17
2016-11-29pull: fast-forward "pull --rebase=true"Libravatar Junio C Hamano1-0/+17
2016-08-12t5520: become resilient to GETTEXT_POISONLibravatar Vasco Almeida1-2/+2
2016-07-26t5520: verify that `pull --rebase` shows the helpful advice when failingLibravatar Johannes Schindelin1-0/+32
2016-07-13Merge branch 'va/i18n-even-more'Libravatar Junio C Hamano1-1/+1
2016-06-17i18n: advice: internationalize message for conflictsLibravatar Vasco Almeida1-1/+1
2016-05-20pull: warn on --verify-signatures with --rebaseLibravatar Alexander Hirsch1-0/+16
2016-04-04t5520: test --[no-]autostash with pull.rebase=trueLibravatar Mehul Jain1-0/+10
2016-04-04t5520: reduce commom lines of codeLibravatar Mehul Jain1-9/+7
2016-04-04t5520: factor out common "failing autostash" codeLibravatar Mehul Jain1-15/+11
2016-04-04t5520: factor out common "successful autostash" codeLibravatar Mehul Jain1-29/+15
2016-04-04t5520: use better test to check stderr outputLibravatar Mehul Jain1-6/+4
2016-04-04t5520: ensure consistent test conditionsLibravatar Mehul Jain1-0/+2
2016-04-04t5520: use consistent capitalization in test titlesLibravatar Mehul Jain1-2/+2
2016-03-21pull --rebase: add --[no-]autostash flagLibravatar Mehul Jain1-0/+70
2016-01-13pull: allow interactive rebase with --rebase=interactiveLibravatar Johannes Schindelin1-0/+10
2015-08-17Merge branch 'kd/pull-rebase-autostash'Libravatar Junio C Hamano1-0/+11
2015-07-22pull: allow dirty tree when rebase.autostash enabledLibravatar Kevin Daudt1-0/+12
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 14:08:04 +0000