From: "Pat Maddox" <pergesu@gmail.com>
To: git@vger.kernel.org
Subject: Submodules and branches
Date: Fri, 4 Apr 2008 12:40:18 -0700 [thread overview]
Message-ID: <810a540e0804041240p4efd0973g7f46a2021b352822@mail.gmail.com> (raw)
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. So when I
push from the submodule to its origin, nothing goes through. The code
is now a part of the master repo.
Is it possible for me to use branches like usual, but with submodules?
Pat
next reply other threads:[~2008-04-04 19:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-04 19:40 Pat Maddox [this message]
2008-04-04 20:02 ` Submodules and branches Avery Pennarun
2008-04-04 20:07 ` Pat Maddox
-- strict thread matches above, loose matches on Subject: below --
2008-04-25 0:41 submodules " Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=810a540e0804041240p4efd0973g7f46a2021b352822@mail.gmail.com \
--to=pergesu@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).