summaryrefslogtreecommitdiffstats
path: root/t/t5520-pull.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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 usersWilliam Duclot2017-07-171-2/+2
* pull: ff --rebase --autostash works in dirty repoTyler Brazier2017-06-011-0/+18
* Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-191-0/+17
|\
| * pull: fast-forward "pull --rebase=true"Junio C Hamano2016-11-291-0/+17
* | t5520: become resilient to GETTEXT_POISONVasco Almeida2016-08-131-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-181-1/+1
* | | pull: warn on --verify-signatures with --rebaseAlexander Hirsch2016-05-211-0/+16
|/ /
* | t5520: test --[no-]autostash with pull.rebase=trueMehul 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
|/
* Merge branch 'kd/pull-rebase-autostash'Junio C Hamano2015-08-181-0/+11
|\
| * pull: allow dirty tree when rebase.autostash enabledKevin Daudt2015-07-221-0/+12
* | pull: handle git-fetch's options as wellPaul Tan2015-06-021-0/+20
* | t5520: check reflog action in fast-forward mergePaul Tan2015-05-291-3/+10
* | t5520: test --rebase failure on unborn branch with indexPaul Tan2015-05-291-0/+15
* | t5520: test --rebase with multiple branchesPaul Tan2015-05-291-0/+9
* | t5520: test work tree fast-forward when fetch updates headPaul Tan2015-05-291-0/+21
* | t5520: test for failure if index has unresolved entriesPaul Tan2015-05-291-0/+19
* | t5520: test no merge candidates casesPaul Tan2015-05-181-0/+55
* | t5520: prevent field splitting in content comparisonsPaul Tan2015-05-181-35/+35
|/
* t5520: test pulling an octopus into an unborn branchJunio C Hamano2015-04-291-0/+9
* t5520: style fixesJunio C Hamano2015-04-291-16/+6
* pull: allow pull to preserve merges when rebasingStephen Haberman2013-09-041-0/+89
* Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano2013-06-271-0/+29
|\
| * pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-211-0/+29
* | t5520: use test_config to set/unset git config variables (leftover bits)Ramkumar Ramachandra2013-03-281-3/+3
* | t5520: use test_config to set/unset git config variablesYann Droneaud2013-03-251-8/+4
|/
* pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason2011-11-071-2/+21
* pull: do not clobber untracked files on initial pullJeff King2011-03-251-0/+11
* Use reflog in 'pull --rebase . foo'Martin von Zweigbergk2010-11-301-0/+7
* Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-221-0/+62
|\
| * pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-131-2/+2
| * t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren2010-08-131-0/+62
* | tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-06-011-1/+1
|/
* allow pull --rebase on branch yet to be bornJeff King2009-08-131-0/+11
* pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-3/+2
* t5520-pull: Test for rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-191-0/+14
* parse-remote: support default reflist in get_remote_merge_branchSanti Béjar2009-06-121-0/+14
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 05:53:09 +0100