Re: [PATCH 6/6] diff-merges: let -m imply -p
> Jonathan Nieder <jrnieder@gmail.com> writes:
Show 10 quoted lines
> > 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.
> Principle of least surprise is still a good thing to follow.
--
Felipe Contreras
Felipe Contreras <felipe.contreras@gmail.com>