On Thu, May 23, 2013 at 06:53:36PM -0500, Felipe Contreras wrote:
> The alternatives are these:
> a) you annoy the vast majority of the user-base by making 'git pull' a
> dangerous operation that should be avoided, and replaced with 'git
> fetch'+'git rebase'.
> b) you annoy a minority of the user-base by making 'git pull' not do
> the merge the expected, so they have to do +'git merge' (which is
> already less of a change than a)), or configure the default (which
> they most likely are able to do, if they did intent to do a merge).
Note that in my email that started this, I tried to be clear that I was
talking about "git pull" *without a branch name*. If this user
explicitly says "git pull remote branch" then I consider that a clear
indication that they really do mean to perform a merge; I would not
recommend changing the current behaviour in that case.
If the user just says "git pull" then it is more likely that they are
just trying to synchronise with the upstream branch, in which case they
probably don't actually want a merge.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html