summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
AgeCommit message (Expand)Author
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
2008-10-17pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano
2008-05-23pull --rebase: exit early when the working directory is dirtyJohannes Schindelin
2008-01-27pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin
2007-11-29Teach 'git pull' about --rebaseJohannes Schindelin
2007-06-07War on whitespaceJunio C Hamano
2007-03-16git-fetch, git-branch: Support local --track via a special remote '.'Paolo Bonzini
2007-01-12use 'init' instead of 'init-db' for shipped docs and toolsNicolas Pitre
2006-11-17git-pull: allow pulling into an empty repositoryLinus Torvalds