Sergey Organov wrote: > Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > > I don't have a strong opinion about what the default for -m should be. > > > >> I think --cc is a lot better than -m for helping you find what users > >> changed when they did the merge, but I agree the format is somewhat > >> difficult for many users to understand. > > I do have strong opinion. --diff-merges=1 is the only sensible > factory-default. Not only it has no implicit assumptions about how given > commit has been achieved, it's also the only format even entire Git > newbie might already be familiar with. I agree. > Principle of least surprise is still a good thing to follow. I could not agree more. -- Felipe Contreras
