Quoting Thomas Rast <trast@xxxxxxxxxxxxxxx> > Especially on IRC, we see many people who are some combination of > misunderstanding, misusing or overusing git-pull. I figure this is > the result of several factors, notably > > a) pull/push are not symmetric, > > b) guides/tutorials recommend pull for situations where they > shouldn't, > > c) people blindly fire commands at git. > > While the latter two are probably hopeless, I find (a) rather > annoying. It breaks everyone's intuition of git-pull when they first > see it. (I know that BK has a pull that also merges, but I gather > from the manual [never used it] that you cannot do the equivalent of > git-fetch in BK.) > > As you probably guessed by now, here is an idea for a very aggressive > transition plan to address (a) in four phases: > > 1. git-fetch gets options --merge/-m and --rebase that make it behave > like (current) git-pull, but requiring explicit arguments. > git-pull gets a new option --merge (-m) that only enforces presence > of arguments. > > 2. git-pull refuses to do any work unless given either --merge or > --rebase. Deprecation warnings for this start at the same time as > (1.). > > 3. git-pull becomes a synonym for git-fetch. > > 4. git-fetch gives deprecation warnings that point the user to > git-pull instead. > > (1.) is probably harmless and could be put into any particular > release. (2.) obviously breaks everyone's favourite script and needs > to fall on a major release. (3.) should be delayed significantly from > (2.) to allow time to expose such breakage, and similarly (4.) should > be delayed after (3.) (or just ignored, but in any case git-pull would > become the preferred spelling). Sorry, but I don't understand what's the improvement in the end result. I started reading your problem description and I thought you are fixing your item 'a) pull/push are not symmetric' by deprecating pull, to advertize fetch/push. Then asymmetry of push/pull stops being an issue. But it seems that eventually you will keep git-push and git-pull (because git-fetch gets deprecated); you have push/pull that are not symmetric. What's the point of this change then? -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- 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