4 Oct
2010
4 Oct
'10
6:35 p.m.
Yes, I and Grubba discussed this some time ago, and came to the same conclusion. I.e. rebase for everyday commits, but allow merges for long-lived topic branches.
Personally I have
[branch] autosetuprebase = remote
in my ~/.gitconfig, which seems like a good idea.