git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Submodules and branches

From
Avery Pennarun <apenwarr@gmail.com>
Date
Apr 4, 2008, 20:02 UTC
Message-ID
<32541b130804041302i1e32e4b3l141e8b08200a2357@mail.gmail.com>
In-Reply-To
<810a540e0804041240p4efd0973g7f46a2021b352822@mail.gmail.com>
On 4/4/08, Pat Maddox <pergesu@gmail.com> wrote:
Show 9 quoted lines
> I've got a repository that uses submodules.  If I cd to the repo root
>  and create a branch, all the submodules are switched to that branch as
>  well.  All good so far.  I go into the submodules and do my work,
>  committing as I go along.  Then when I'm all done and want to merge
>  the changes into my master branch, I cd back to the repo root and do
>  "git merge new_topic"
>
>  That's where it breaks down.  The commits that I made go into the
>  master repo itself, and the submodules don't have them.

There is something wrong with your story somewhere: submodules in git each have their own, completely independent, branching/merging/pulling/pushing etc. What makes you think the submodules are branching at the same time as your supermodule?

Perhaps you have accidentally committed the *files* from your submodule into your supermodule, which means you're not using git-submodule at all.

Have fun,
Avery
Previous: Pat MaddoxNext: Pat Maddox
Message 2 of 3 in “Submodules and branches”
  1. Pat MaddoxApr 4, 2008
  2. Avery PennarunApr 4, 2008
  3. Pat MaddoxApr 4, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.