On Tue, Sep 3, 2013 at 12:21 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > >> Junio already sent a similar patch, but I think this is simpler. > > I agree that this is simpler, but I am not sure if the behaviour is > necessarily better (note that this is different from saying "I think > the behaviour of this patch is worse"). The motivation I read from > the original discussion was that new people did "git pull" (no other > parameters) to "sync my tree with the central repository" as if it > were SVN, and because we are not SVN, projects that prefer rebases > were unhappy, and the other one was to address *only* that use case. > I do not personally like that special casing (i.e. "only when no > 'integrate with what from where' is given"), and applying the "you > must be explicit between rebase and merge" like this series does > uniformly might (or might not) be a good thing. I dunno. As I already said; there's is essentially no difference between "git pull" and "git pull origin". > The difference in changes needed to the test suite is illustrative; > this series affects any use of "git pull" (with or without explicit > "what to integrate with and from where"), unlike the other one that > only affects the case where "git pull" was not given "what to > integrate with and from where". I think an earlier draft I did for > the previous one did not special case "only when no 'integrate with > what from where' is given" and had to touch all the places in the > test in a similar way. Yeah, that version affects less, but it also doesn't achieve what we actually want. Either way, that's why I sent another version that doesn't need modifications on the tests. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html