Re: [PATCH] GIT commit statistics.
From: Petr Baudis <hidden>
Date: 2016-06-15 22:42:11
Dear diary, on Mon, Nov 14, 2005 at 09:51:29AM CET, I got a letter where Martin Langhoff [off-list ref] said that...
In the meantime, the user experience of working with a small team and a shared repo has improved significantly by switching from cg-update to cg-fetch && git-rebase origin. So much so that I suspect that it'd be a big win for cg-update to default to rebase on merges from 'origin'.
I still don't understand what's the point. And it is confusing for the user, since the history suddenly doesn't reflect how the GIT development happened (which is what the history is about), and it is downright deadly as soon as more than one branch gets around, which makes it even more confusing for the user (you can do cg-update, yeah - oh wait, unless you do X, then you need to remember to always do cg-update -R or whatever). All the woes just to get rid of the merge commits. What's wrong on merge commits? If they irritate you so much, cg-log -M. ;-) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.