Shall we try to decide on a policy for merging vs rebasing? Personally I prefer simple linear histories. That makes it easy to follow the log, and it simplifies bisecting. Iow, the default would be to use "rebase = true" in tracking branches.
Branches and merges still have their place, but imo they're better suited for more long-lived topic branches.
