It obviously disagrees with you since git pull exists and the only way to coerce rebase -i in letting you rewrite the history without rebasing is arcane and inane (and may fail and end up trying to rebase your whole history on top of whoever the fuck knows what)
Oh the git pull. It's not just that implied --rebase would fit most actual workflows much better, but even when merging it does it in the wrong order for about everyone except Linus himself.
git pull does the right thing when you are doing git pull someremote/somefeature (or should it be someremote:somefeature?). Then it merges that feature into your master.
When you do git pull origin/master, you totally don't want to have the master merged into your branch, you want your branch merged into master. The order of the parents in the merge commit is all wrong, and it shows up as the ugliest mess in gitk.
Not to mention that I generally would like to see what I am rebasing my changes on top of (especially so when using git pull in the supposedly intended way!), but it's not streamlined at all. It's like playing Russian Roulette, git pull #YOLO. Of course you can examine shit afterwards and fix anything that went wrong, but it's really not streamlined at all.
5
u/masklinn Jun 19 '14 edited Jun 19 '14
It obviously disagrees with you since
git pullexists and the only way to coercerebase -iin letting you rewrite the history without rebasing is arcane and inane (and may fail and end up trying to rebase your whole history on top of whoever the fuck knows what)