mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-05 02:27:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

big progress on fetch

Browse source
This commit is contained in:
Peter Cottle 2013-10-22 09:42:18 -07:00
parent c7ba5c3afe
commit 99bf9bacd3
5 changed files with 88 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
todo.txt
View file

@ -22,12 +22,6 @@ aka fetch + merge, just like expected. ill probably still update o/master just f
just pass options into fetch, then merge the source.
2) oh boy heres anothere data point. git fetch banana:banana will actually fast-forward banana to what remote has, but not update o/banana. weirdly it doesnt let you do this if you are checked out on banana
3) furthermore, if banana has commits and its not a FF, it will reject the command. wth??
3.5) but of course git fetch banana:oBanana will make a new branch
4) and then "git pull origin banana:origin/banana" works because it goes into the remote branch and then merges the fetch HEAD with current location
[ ] FIX the level you came up with
@ -50,6 +44,8 @@ Ideas for cleaning
Done things:
(I only started this on Dec 17th 2012 to get a better sense of what was done)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[x] oh boy heres anothere data point. git fetch banana:banana will actually fast-forward banana to what remote has, but not update o/banana. weirdly it doesnt let you do this if you are checked out on banana
[x] furthermore, if banana has commits and its not a FF, it will reject the command. wth??
[x] test is failing because we create banana when we should only really be creating o/banana
[x] work on TABBED levels layout
[x] EASY -- make colors the same between remote branches and their remote counterparts