summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
AgeCommit message (Expand)Author
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
2015-05-29t5520: test for failure if index has unresolved entriesPaul Tan
2015-05-18t5520: test no merge candidates casesPaul Tan
2015-05-18t5520: prevent field splitting in content comparisonsPaul Tan
2015-04-29t5520: test pulling an octopus into an unborn branchJunio C Hamano
2015-04-29t5520: style fixesJunio C Hamano
2013-09-04pull: allow pull to preserve merges when rebasingStephen Haberman
2013-06-27Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano
2013-06-20pull: merge into unborn by fast-forwarding from empty treeThomas Rast
2013-03-28t5520: use test_config to set/unset git config variables (leftover bits)Ramkumar Ramachandra
2013-03-25t5520: use test_config to set/unset git config variablesYann Droneaud
2011-11-07pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason
2011-03-25pull: do not clobber untracked files on initial pullJeff King
2010-11-29Use reflog in 'pull --rebase . foo'Martin von Zweigbergk
2010-08-22Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano
2010-08-13pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren
2010-08-13t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren
2010-05-31tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan
2009-08-12allow pull --rebase on branch yet to be bornJeff King
2009-07-19pull: support rebased upstream + fetch + pull --rebaseSanti Béjar
2009-07-19t5520-pull: Test for rebased upstream + fetch + pull --rebaseSanti Béjar
2009-06-12parse-remote: support default reflist in get_remote_merge_branchSanti Béjar