Re: [PATCH v7 0/3] submodule update: add --remote for submodule's upstream changes
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 12, 2012, 18:19 UTC
- Message-ID
- <7vzk1j3zgr.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20121212152437.GB5157@odin.tremily.us>
"W. Trevor King" <wking@tremily.us> writes:
> On Tue, Dec 11, 2012 at 09:42:48PM -0800, Junio C Hamano wrote: >> What branch did you base this series on? > > Every version of this series has been based on v1.8.0.
Thanks.
There were quite a few changes to git-submodule.sh since then to 'master' and I had to either wiggle the patch or know which exact one 1/3 needs to be applied to in order to allow 2/3 to apply (try applying these three to 'master' yourself---you will likely to see that 2/3 will stop with conflicts).
In any case, I ended up applying them by editing the patches, and I should have a good copy in 'pu'. Please double check the result.
Thanks.