On: Git in one image

[chousuke]

pull is "default" in that everyone gets taught to use it and you have to unlearn that once you realize it's not what you want most of the time.

[onetom → chousuke]

this statement surpises me, because `git pull --rebase` is practically my most frequently used operation, besides commit, push and changing branches.

intellij even comes with the concept of update, which is either a `pull` or a `pull --rebase`

it asks u once which of those should be the default behaviour, then all i do is cmd-t to updaTe (aka git pull --rebase) my current branch, then push my commits, after a potential 3-way merge, which intellij has the easiest-to-learn interface for, imho.

[chousuke → onetom]

"git pull --rebase" is not "git pull", it's a different operation. I agree it would be a better default to rebase instead of merge though.

[ziml77 → onetom]

You can make --rebase the default:

git config --global pull.rebase true

I have this set because it's never intentional when I do a pull to end up with an ugly merge commit