summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
AgeCommit message (Expand)AuthorFilesLines
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
2015-06-02pull: handle git-fetch's options as wellLibravatar Paul Tan1-0/+20
2015-05-29t5520: check reflog action in fast-forward mergeLibravatar Paul Tan1-3/+10
2015-05-29t5520: test --rebase failure on unborn branch with indexLibravatar Paul Tan1-0/+15
2015-05-29t5520: test --rebase with multiple branchesLibravatar Paul Tan1-0/+9
2015-05-29t5520: test work tree fast-forward when fetch updates headLibravatar Paul Tan1-0/+21
2015-05-29t5520: test for failure if index has unresolved entriesLibravatar Paul Tan1-0/+19
2015-05-18t5520: test no merge candidates casesLibravatar Paul Tan1-0/+55
2015-05-18t5520: prevent field splitting in content comparisonsLibravatar Paul Tan1-35/+35
2015-04-29t5520: test pulling an octopus into an unborn branchLibravatar Junio C Hamano1-0/+9
2015-04-29t5520: style fixesLibravatar Junio C Hamano1-16/+6
2013-09-04pull: allow pull to preserve merges when rebasingLibravatar Stephen Haberman1-0/+89
2013-06-27Merge branch 'jk/pull-into-dirty-unborn'Libravatar Junio C Hamano1-0/+29
2013-06-20pull: merge into unborn by fast-forwarding from empty treeLibravatar Thomas Rast1-0/+29
2013-03-28t5520: use test_config to set/unset git config variables (leftover bits)Libravatar Ramkumar Ramachandra1-3/+3
2013-03-25t5520: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-8/+4
2011-11-07pull: introduce a pull.rebase option to enable --rebaseLibravatar Ævar Arnfjörð Bjarmason1-2/+21
2011-03-25pull: do not clobber untracked files on initial pullLibravatar Jeff King1-0/+11
2010-11-29Use reflog in 'pull --rebase . foo'Libravatar Martin von Zweigbergk1-0/+7
2010-08-21Merge branch 'en/rebase-against-rebase-fix'Libravatar Junio C Hamano1-0/+62
2010-08-12pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesLibravatar Elijah Newren1-2/+2
2010-08-12t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseLibravatar Elijah Newren1-0/+62
2010-05-31tests: use "test_cmp", not "diff", when verifying the resultLibravatar Gary V. Vaughan1-1/+1
2009-08-12allow pull --rebase on branch yet to be bornLibravatar Jeff King1-0/+11
2009-07-19pull: support rebased upstream + fetch + pull --rebaseLibravatar Santi Béjar1-3/+2
2009-07-19t5520-pull: Test for rebased upstream + fetch + pull --rebaseLibravatar Santi Béjar1-0/+14
2009-06-11parse-remote: support default reflist in get_remote_merge_branchLibravatar Santi Béjar1-0/+14
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchLibravatar Junio C Hamano1-0/+12
2008-05-22pull --rebase: exit early when the working directory is dirtyLibravatar Johannes Schindelin1-0/+18
2008-01-26pull --rebase: be cleverer with rebased upstream branchesLibravatar Johannes Schindelin1-0/+17
2007-11-28Teach 'git pull' about --rebaseLibravatar Johannes Schindelin1-0/+22
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 17:19:18 +0000