aboutsummaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
Commit message (Expand)AuthorAge
* rebase: make resolve message clearer for inexperienced usersWilliam Duclot2017-07-17
* pull: ff --rebase --autostash works in dirty repoTyler Brazier2017-06-01
* Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-19
|\
| * pull: fast-forward "pull --rebase=true"Junio C Hamano2016-11-29
* | t5520: become resilient to GETTEXT_POISONVasco Almeida2016-08-12
* | t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin2016-07-26
* | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-13
|\ \
| * | i18n: advice: internationalize message for conflictsVasco Almeida2016-06-17
* | | pull: warn on --verify-signatures with --rebaseAlexander Hirsch2016-05-20
|/ /
* | t5520: test --[no-]autostash with pull.rebase=trueMehul Jain2016-04-04
* | t5520: reduce commom lines of codeMehul Jain2016-04-04
* | t5520: factor out common "failing autostash" codeMehul Jain2016-04-04
* | t5520: factor out common "successful autostash" codeMehul Jain2016-04-04
* | t5520: use better test to check stderr outputMehul Jain2016-04-04
* | t5520: ensure consistent test conditionsMehul Jain2016-04-04
* | t5520: use consistent capitalization in test titlesMehul Jain2016-04-04
* | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-21
* | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-13
|/
* Merge branch 'kd/pull-rebase-autostash'Junio C Hamano2015-08-17
|\
| * pull: allow dirty tree when rebase.autostash enabledKevin Daudt2015-07-22
* | pull: handle git-fetch's options as wellPaul Tan2015-06-02
* | t5520: check reflog action in fast-forward mergePaul Tan2015-05-29
* | t5520: test --rebase failure on unborn branch with indexPaul Tan2015-05-29
* | t5520: test --rebase with multiple branchesPaul Tan2015-05-29
* | t5520: test work tree fast-forward when fetch updates headPaul Tan2015-05-29
* | t5520: test for failure if index has unresolved entriesPaul Tan2015-05-29
* | t5520: test no merge candidates casesPaul Tan2015-05-18
* | t5520: prevent field splitting in content comparisonsPaul Tan2015-05-18
|/
* t5520: test pulling an octopus into an unborn branchJunio C Hamano2015-04-29
* t5520: style fixesJunio C Hamano2015-04-29
* pull: allow pull to preserve merges when rebasingStephen Haberman2013-09-04
* Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano2013-06-27
|\
| * pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-20
* | t5520: use test_config to set/unset git config variables (leftover bits)Ramkumar Ramachandra2013-03-28
* | t5520: use test_config to set/unset git config variablesYann Droneaud2013-03-25
|/
* pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason2011-11-07
* pull: do not clobber untracked files on initial pullJeff King2011-03-25
* Use reflog in 'pull --rebase . foo'Martin von Zweigbergk2010-11-29
* Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-21
|\
| * pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-12
| * t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren2010-08-12
* | tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-05-31
|/
* allow pull --rebase on branch yet to be bornJeff King2009-08-12
* pull: support rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-19
* t5520-pull: Test for rebased upstream + fetch + pull --rebaseSanti Béjar2009-07-19
* parse-remote: support default reflist in get_remote_merge_branchSanti Béjar2009-06-11
* pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano2008-10-17
* pull --rebase: exit early when the working directory is dirtyJohannes Schindelin2008-05-22
* pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin2008-01-26
* Teach 'git pull' about --rebaseJohannes Schindelin2007-11-28
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-20 20:27:21 +0000