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

2014-04-30 Thread Junio C Hamano
Felipe Contreras writes: > Junio C Hamano wrote: >> Felipe Contreras writes: >> ... >> > This plan, however, fell off the cliff. >> >> Yeah, I see that $gmane/234488 explains why the second step in the >> previous one stopped. I guess it was in expecting a reroll state, >> waiting for that oth

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

2014-04-30 Thread Junio C Hamano
Felipe Contreras writes: > Junio C Hamano wrote: > ... >> Until the "--merge" option is added, "pull.mode = merge" cannot be >> the same as "git pull --merge". I think you either need to squash >> these two steps into one, or flip the order of them. > > Yeah, but the documentation of --merge sho

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

2014-04-30 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > >> - With the endgame of "out of box Git without any configuration > >> refuses 'git pull' (without --merge/--rebase) that does not > >> fast forward" in mind, start warning "In the future you will > >> have to either set

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

2014-04-30 Thread Junio C Hamano
Felipe Contreras writes: >> - With the endgame of "out of box Git without any configuration >> refuses 'git pull' (without --merge/--rebase) that does not >> fast forward" in mind, start warning "In the future you will >> have to either set pull.mode (and/or its friends) or

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

2014-04-30 Thread Felipe Contreras
Junio C Hamano wrote: > Felipe Contreras writes: > > > These are the steps needed to achieve this: > > The overall progression (this comment is only about the design, not > the implementation) looks almost sensible, but I may have missed > some issues because the presentation was done in reverse

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

2014-04-30 Thread Junio C Hamano
Felipe Contreras writes: > These are the steps needed to achieve this: The overall progression (this comment is only about the design, not the implementation) looks almost sensible, but I may have missed some issues because the presentation was done in reverse. In the following comment, I'll fl

[PATCH v5 0/6] Reject non-ff pulls by default

2014-04-29 Thread Felipe Contreras
It is very typical for Git newcomers to inadvertently create merges and worst: inadvertently pushing them. This is one of the reasons many experienced users prefer to avoid 'git pull', and recommend newcomers to avoid it as well. To avoid these problems and keep 'git pull' useful, it has been agre