From: Jonathan Nieder Date: Sun, 06 Feb 2011 22:09:39 GMT Subject: Re: [PATCH] git pull: Remove option handling done by fetch Message-ID: <20110206220939.GC17210@elie> In-Reply-To: <4D4F19D0.2000408@web.de> Jens Lehmann wrote: > Am 06.02.2011 21:45, schrieb Junio C Hamano: >> Jens Lehmann writes: >>> Yes, but isn't that exactly what the pull man-page says? Quote: >>> "Options meant for git pull itself and the underlying git merge >>> must be given before the options meant for git fetch." >> >> Yes, it says that, and I think that was a weasely way to say "the command >> line parser in git-pull is broken". [...] > (CCed Jonathan, as he is the author of the lines I quoted) They're from Junio. :) See v1.5.4.5~26 (git-pull documentation: warn about the option order, 2008-03-10). I also agree that (1) it would be very nice to find a way to fix this and (2) until then, it seems best as a general principle not to regress in those odd cases where we sort of fixed it. In other words, if we were adding --recurse-submodules today, I'd agree that it should be treated like other fetch options, but we already added the option and some people/scripts might be used to the added flexibility, no?