From: Avery Pennarun Date: Sat, 05 Apr 2008 23:11:02 GMT Subject: Re: Updating submodules Message-ID: <32541b130804051611q396fcffch79f7ad1e391af73c@mail.gmail.com> In-Reply-To: <810a540e0804051608s6b6580a3vd4bf9ae04c22f3d4@mail.gmail.com> On 4/5/08, Pat Maddox wrote: > On Sat, Apr 5, 2008 at 4:01 PM, Avery Pennarun wrote: > > > > On 4/5/08, Pat Maddox wrote: > > > Do I need to cd into each submodule dir and fetch/rebase? git > > > submodule update doesn't seem to do anything, though I would assume > > > it's used to update the submodules... > > > > "git submodule update" updates each submodule to the version that was > > checked into the supermodule. It doesn't do anything like fetch, > > rebase, or pull. > > Okay. So I've got a parent repo with three submodules. I've been > working in one submodule and have been committing changes. Now I > wanted to get the latest changes upstream...I have to rebase that repo > individually, right? Yes. Be careful of which branch your submodule is on; if "git submodule update" has done anything in the past, you might not be on a branch at all, in which case you have to create a local branch with your changes before you can safely rebase or push. Avery