summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
Commit message (Expand)AuthorAgeFilesLines
* fetch: add branch.*.merge to default ref-prefix extensionJeff King2022-09-081-0/+17
* pull --rebase: honor rebase.autostash when fast-forwardingPhilippe Blain2022-01-141-0/+13
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-181-21/+3
|\
| * tests: stop testing `git rebase --preserve-merges`Johannes Schindelin2021-09-071-18/+0
| * t5520: do not use `pull.rebase=preserve`Johannes Schindelin2021-09-071-3/+3
* | pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-10/+10
|/
* test-lib functions: add --printf option to test_commitÆvar Arnfjörð Bjarmason2021-05-111-8/+2
* t55[23]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-16/+16
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* t5520: avoid alternation in grep's BRE (not POSIX)Carlo Marcelo Arenas Belón2020-05-201-1/+1
* pull: pass --autostash to mergeDenton Liu2020-04-101-8/+35
* t5520: make test_pull_autostash() accept expect_parent_numDenton Liu2020-04-101-6/+8
* rebase: rename the two primary rebase backendsElijah Newren2020-02-161-1/+1
* rebase: change the default backend from "am" to "merge"Elijah Newren2020-02-161-4/+6
* rebase tests: repeat some tests using the merge backend instead of amElijah Newren2020-02-161-2/+15
* t5520: replace `! git` with `test_must_fail git`Denton Liu2019-11-211-2/+2
* t5520: remove redundant lines in test casesDenton Liu2019-11-211-8/+0
* t5520: replace $(cat ...) comparison with test_cmpDenton Liu2019-11-211-35/+70
* t5520: don't put git in upstream of pipeDenton Liu2019-11-211-1/+2
* t5520: test single-line files by git with test_cmpDenton Liu2019-11-211-16/+48
* t5520: use test_cmp_rev where possibleDenton Liu2019-11-211-25/+25
* t5520: replace test -{n,z} with test-lib functionsDenton Liu2019-11-211-4/+8
* t5520: use test_line_count where possibleDenton Liu2019-11-211-1/+2
* t5520: remove spaces after redirect operatorDenton Liu2019-11-211-5/+5
* t5520: replace test -f with test-lib functionsDenton Liu2019-11-211-5/+5
* t5520: let sed open its own inputDenton Liu2019-11-211-1/+1
* t5520: use sq for test case namesDenton Liu2019-11-211-2/+2
* t5520: improve test styleDenton Liu2019-11-211-43/+45
* tests: optionally skip `git rebase -p` testsJohannes Schindelin2018-11-021-2/+4
* Merge branch 'js/pull-rebase-type-shorthand'Junio C Hamano2018-08-171-0/+12
|\
| * pull --rebase=<type>: allow single-letter abbreviations for the typeJohannes Schindelin2018-08-061-0/+12
* | has_uncommitted_changes(): fall back to empty treeJeff King2018-07-111-0/+12
|/
* rebase: make resolve message clearer for inexperienced userswd/rebase-conflict-guideWilliam Duclot2017-07-171-2/+2
* pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostashTyler Brazier2017-06-011-0/+18
* Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-191-0/+17
|\
| * pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-291-0/+17
* | t5520: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-2/+2
* | t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin2016-07-261-0/+32
* | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-1/+1
|\ \
| * | i18n: advice: internationalize message for conflictsVasco Almeida2016-06-171-1/+1
* | | pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebaseAlexander Hirsch2016-05-201-0/+16
|/ /
* | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostashMehul Jain2016-04-041-0/+10
* | t5520: reduce commom lines of codeMehul Jain2016-04-041-9/+7
* | t5520: factor out common "failing autostash" codeMehul Jain2016-04-041-15/+11
* | t5520: factor out common "successful autostash" codeMehul Jain2016-04-041-29/+15
* | t5520: use better test to check stderr outputMehul Jain2016-04-041-6/+4
* | t5520: ensure consistent test conditionsMehul Jain2016-04-041-0/+2
* | t5520: use consistent capitalization in test titlesMehul Jain2016-04-041-2/+2
* | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-211-0/+70
* | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-131-0/+10
|/
View Lorry Controller Status