--no-ff should be the default for all non-trivial merges (e.g. >1 commit) because it allows you to revert the merge easily.
And this is an example of a fix that git could use to be more usable.
It is my understanding that most people want a GUI with changes like the OP is mentioning and a CLI with a few subtle ease of use changes like --no-ff being default and more sane force options. For instance git push -f being --force-with-lease instead of --force.
This whole thread is a series of somebody pointing out a problem in Gits interface or how to make Git more usable, and then you responding with "git is not completely unusable!!!", including your very first comment.
It's reminiscent of the threads about PHP a couple of years ago. Somebody would point out an obvious flaw in PHP, like inconsistent naming, and then another person would respond "this is just a small problem!!!" over and over for zillions of flaws.
At some point you just have to accept that yes, Gits interface is pretty damn ugly. It doesn't mean Git is useless, but it could be a whole lot better than it is now.
4
u/Guvante Jun 19 '14
And this is an example of a fix that git could use to be more usable.
It is my understanding that most people want a GUI with changes like the OP is mentioning and a CLI with a few subtle ease of use changes like --no-ff being default and more sane force options. For instance git push -f being --force-with-lease instead of --force.