summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
AgeCommit message (Expand)AuthorFilesLines
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
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-03-16git-fetch, git-branch: Support local --track via a special remote '.'Libravatar Paolo Bonzini1-0/+24
2007-01-12use 'init' instead of 'init-db' for shipped docs and toolsLibravatar Nicolas Pitre1-1/+1
2006-11-16git-pull: allow pulling into an empty repositoryLibravatar Linus Torvalds1-0/+33