summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
Commit message (Expand)AuthorAgeFilesLines
* pull: do not clobber untracked files on initial pullJeff King2011-03-251-0/+11
* Use reflog in 'pull --rebase . foo'Martin von Zweigbergk2010-11-291-0/+7
* Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-211-0/+62
|\
| * pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-121-2/+2
| * t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren2010-08-121-0/+62
* | tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-05-311-1/+1
|/
* allow pull --rebase on branch yet to be bornJeff King2009-08-121-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-111-0/+14
* pull: allow "git pull origin $something:$current_branch" into an unborn branchJunio C Hamano2008-10-171-0/+12
* pull --rebase: exit early when the working directory is dirtyJohannes Schindelin2008-05-221-0/+18
* pull --rebase: be cleverer with rebased upstream branchesJohannes Schindelin2008-01-261-0/+17
* Teach 'git pull' about --rebaseJohannes Schindelin2007-11-281-0/+22
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* git-fetch, git-branch: Support local --track via a special remote '.'Paolo Bonzini2007-03-161-0/+24
* use 'init' instead of 'init-db' for shipped docs and toolsNicolas Pitre2007-01-121-1/+1
* git-pull: allow pulling into an empty repositoryLinus Torvalds2006-11-161-0/+33