diff --git a/todo.txt b/todo.txt index e267c270..1330ffa8 100644 --- a/todo.txt +++ b/todo.txt @@ -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 =======================