From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Avery Pennarun" <apenwarr@gmail.com>
Subject: Re: Updating submodules
Date: Sat, 5 Apr 2008 19:11:02 -0400
Message-ID: <32541b130804051611q396fcffch79f7ad1e391af73c@mail.gmail.com>
References: <810a540e0804051546o250bd3e7mf7a20d8f1cc6dcfc@mail.gmail.com>
	 <32541b130804051601w4f7976cawde47a70e04790511@mail.gmail.com>
	 <810a540e0804051608s6b6580a3vd4bf9ae04c22f3d4@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: git@vger.kernel.org
To: "Pat Maddox" <pergesu@gmail.com>
X-From: git-owner@vger.kernel.org Sun Apr 06 01:11:52 2008
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1JiHY6-0006Zg-TT
	for gcvg-git-2@gmane.org; Sun, 06 Apr 2008 01:11:51 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753932AbYDEXLH (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Sat, 5 Apr 2008 19:11:07 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753929AbYDEXLG
	(ORCPT <rfc822;git-outgoing>); Sat, 5 Apr 2008 19:11:06 -0400
Received: from fg-out-1718.google.com ([72.14.220.158]:12651 "EHLO
	fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753810AbYDEXLF (ORCPT <rfc822;git@vger.kernel.org>);
	Sat, 5 Apr 2008 19:11:05 -0400
Received: by fg-out-1718.google.com with SMTP id l27so712063fgb.17
        for <git@vger.kernel.org>; Sat, 05 Apr 2008 16:11:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
        bh=ZIQ6cZigeT6GKjosK12kGQW/vOYbMTDmtpzxpGEVkao=;
        b=OIyYhxsstNF1P5jZQfgFP5H3pP059c9e3XClJsgLE8FHiY1LjVJv9siumO8nEtJsis8BFx86TmzV34DEzM9XHA3lC1dhuXb11joSxo96tstQyz95S1CpTdX949eMSfxESDsPWww7zaGdpIfnBB5xnnINWfFQ4GvJDp1MA8wQg3A=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
        b=XC62q2os1I8ha8LD8aRMhY32o9zT8tus1H4hYOGgDheX7Xgxez4Uz0twBJYmqdP6JIzlsIUBt7Ksz/w+Iao+L9J7pp5/BwjdnGhkm5fmNRzoc8GebH7XmMNMV1DX+2UtuFEwqexSwkcdN+3sf9srr8UhBMt/pNQkiLnZbbR+r+I=
Received: by 10.82.167.9 with SMTP id p9mr1457942bue.41.1207437063101;
        Sat, 05 Apr 2008 16:11:03 -0700 (PDT)
Received: by 10.82.100.5 with HTTP; Sat, 5 Apr 2008 16:11:02 -0700 (PDT)
In-Reply-To: <810a540e0804051608s6b6580a3vd4bf9ae04c22f3d4@mail.gmail.com>
Content-Disposition: inline
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/78867>

On 4/5/08, Pat Maddox <pergesu@gmail.com> wrote:
> On Sat, Apr 5, 2008 at 4:01 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
>  >
>  > On 4/5/08, Pat Maddox <pergesu@gmail.com> 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