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

notes for arguments

Browse source
This commit is contained in:
Peter Cottle 2013-10-15 15:30:34 -07:00
parent 3dd5102e2a
commit 15e8877e95
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
todo.txt
View file

@ -13,6 +13,20 @@ Medium things:
[ ] disable git commands on hg levels (and vice versa)
Argument things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~
1) ok say I have branch banana and its one commit ahead of master. if I git pull origin master while checked out on banana, it fetches those commits (doesnt update origin/master) and then merges them into banana.
aka fetch + merge, just like expected. ill probably still update o/master just for sanity. master is the source on the remote and HEAD is the source on local (place to merge). o/master gets updated regardless
2) ok so say I'm on a new branch banana thats not on remote. if I do "git push" then it will MAKE a new branch on remote and push my commits there. same thing with "git push origin banana". Basically banana has to be a local ref, and if so, it will just make the ref on remote.
so "git push origin branchNotOnLocal" fails but "git push origin someBranch" will make the someBranch on remote.
3) HOWEVER if I'm git push-ing on banana and I say "git push origin master" then it pretends Im checked out on master. aka master is both source and destination, as expected. this is really 3
4)
Cases to handle / things to edit
=======================