path: root/t/
AgeCommit message (Expand)Author
2020-11-19t55[23]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-05-20t5520: avoid alternation in grep's BRE (not POSIX)Carlo Marcelo Arenas Belón
2020-04-10pull: pass --autostash to mergeDenton Liu
2020-04-10t5520: make test_pull_autostash() accept expect_parent_numDenton Liu
2020-02-16rebase: rename the two primary rebase backendsElijah Newren
2020-02-16rebase: change the default backend from "am" to "merge"Elijah Newren
2020-02-16rebase tests: repeat some tests using the merge backend instead of amElijah Newren
2019-11-21t5520: replace `! git` with `test_must_fail git`Denton Liu
2019-11-21t5520: remove redundant lines in test casesDenton Liu
2019-11-21t5520: replace $(cat ...) comparison with test_cmpDenton Liu
2019-11-21t5520: don't put git in upstream of pipeDenton Liu
2019-11-21t5520: test single-line files by git with test_cmpDenton Liu
2019-11-21t5520: use test_cmp_rev where possibleDenton Liu
2019-11-21t5520: replace test -{n,z} with test-lib functionsDenton Liu
2019-11-21t5520: use test_line_count where possibleDenton Liu
2019-11-21t5520: remove spaces after redirect operatorDenton Liu
2019-11-21t5520: replace test -f with test-lib functionsDenton Liu
2019-11-21t5520: let sed open its own inputDenton Liu
2019-11-21t5520: use sq for test case namesDenton Liu
2019-11-21t5520: improve test styleDenton Liu
2018-11-02tests: optionally skip `git rebase -p` testsJohannes Schindelin
2018-08-17Merge branch 'js/pull-rebase-type-shorthand'Junio C Hamano
2018-08-06pull --rebase=<type>: allow single-letter abbreviations for the typeJohannes Schindelin
2018-07-11has_uncommitted_changes(): fall back to empty treeJeff King
2017-07-17rebase: make resolve message clearer for inexperienced usersWilliam Duclot
2017-06-01pull: ff --rebase --autostash works in dirty repoTyler Brazier
2016-12-19Merge branch 'jc/pull-rebase-ff'Junio C Hamano
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano
2016-08-12t5520: become resilient to GETTEXT_POISONVasco Almeida
2016-07-26t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano
2016-06-17i18n: advice: internationalize message for conflictsVasco Almeida
2016-05-20pull: warn on --verify-signatures with --rebaseAlexander Hirsch
2016-04-04t5520: test --[no-]autostash with pull.rebase=trueMehul Jain
2016-04-04t5520: reduce commom lines of codeMehul Jain
2016-04-04t5520: factor out common "failing autostash" codeMehul Jain
2016-04-04t5520: factor out common "successful autostash" codeMehul Jain
2016-04-04t5520: use better test to check stderr outputMehul Jain
2016-04-04t5520: ensure consistent test conditionsMehul Jain
2016-04-04t5520: use consistent capitalization in test titlesMehul Jain
2016-03-21pull --rebase: add --[no-]autostash flagMehul Jain
2016-01-13pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin
2015-08-17Merge branch 'kd/pull-rebase-autostash'Junio C Hamano
2015-07-22pull: allow dirty tree when rebase.autostash enabledKevin Daudt
2015-06-02pull: handle git-fetch's options as wellPaul Tan
2015-05-29t5520: check reflog action in fast-forward mergePaul Tan
2015-05-29t5520: test --rebase failure on unborn branch with indexPaul Tan
2015-05-29t5520: test --rebase with multiple branchesPaul Tan
2015-05-29t5520: test work tree fast-forward when fetch updates headPaul Tan