diff --git a/todo.txt b/todo.txt index 23d4869c..9380e9f2 100644 --- a/todo.txt +++ b/todo.txt @@ -20,7 +20,17 @@ Argument things: 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 -just pass options into fetch, then merge the source (or all). BOOM +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 Cases to handle / things to edit =======================