Re: [PATCH 0/3] Reject non-ff pulls by default

On Wed, Sep 11, 2013 at 6:38 AM, Matthieu Moy
[off-list ref] wrote:

Felipe Contreras [off-list ref] writes:

quoted

On Tue, Sep 10, 2013 at 3:26 AM, Matthieu Moy
[off-list ref] wrote:

quoted

So, you insist in asking the user to chose between rebase and merge, but
you also insist that they will not chose rebase? So, why ask?

Because as you said, they don't know what that is.

That does not answer my question: why ask?

If you have to ask, then you haven't read the commit messages, the
cover letter, or the relevant discussion. Even Linus Torvalds agreed
this was a good change.

Look around you what people say about Git. See how many complain about
Git not exposing enough complexity to the user. See how many would
complain about Git not advertising rebase enough. Then, look how many
complain about Git exposing too much complexity and making it too easy
to use features like rebase.

And see how many are confused by Git doing something they never told
it to do, and then being totally lost because they are in the middle
of a state they don't understand, and how many do merges by mistake.

There's a reason why Git user-base considers 'git pull' dangerous.

-- 
Felipe Contreras