On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote: > On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote: > > On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King <wk...@tremily.us> wrote: > > > submodule.<name>.branch:: > > > A remote branch name for tracking updates in the upstream > > > submodule. > > > - If the option is not specified, it defaults to 'master'. See the > > > - `--remote` documentation in linkgit:git-submodule[1] for details. > > > + If the option is not specified, it defaults to the subproject's > > > > Did you mean s/subproject/submodule/ ? > > > > > + HEAD. See the `--remote` documentation in > > > linkgit:git-submodule[1] > > > + for details. > > No the remote branch is in the upstream subproject. I suppose I meant > “the submodule's remote-tracking branch following the upstream > subproject's HEAD which we just fetched so it's fairly current” ;).
Hmm, maybe we should change the existing “upstream submodule” to “upstream subproject” for consistency? Trevor -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
signature.asc
Description: OpenPGP digital signature
