* sub module branches
@ 2010-03-08 11:14 Mahesh Vaidya
2010-03-08 13:05 ` Peter Krefting
2010-03-09 0:47 ` Avery Pennarun
0 siblings, 2 replies; 3+ messages in thread
From: Mahesh Vaidya @ 2010-03-08 11:14 UTC (permalink / raw)
To: git
Hi
I have a situation like
project/source.git
/submod_1
/submod_2
I need to modify code in all 3 repos viz. source, submod_1 & submod_2.
If I create branch in source, will it propogate to remaining
submodules ? or in other words can I have "global branch" and "global
tag"
Thx/
Mahesh.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: sub module branches
2010-03-08 11:14 sub module branches Mahesh Vaidya
@ 2010-03-08 13:05 ` Peter Krefting
2010-03-09 0:47 ` Avery Pennarun
1 sibling, 0 replies; 3+ messages in thread
From: Peter Krefting @ 2010-03-08 13:05 UTC (permalink / raw)
To: Mahesh Vaidya; +Cc: Git Mailing List
Mahesh Vaidya:
> If I create branch in source, will it propogate to remaining submodules ?
No, the branch is only created in the top-level module.
> or in other words can I have "global branch" and "global tag"
The branch is "global" in the way that it does contain a reference to the
current commit of the submodule. You do not *need* to have a local branch
in the submodule to change where it pointed to from the top-level module. It
does help to have it, though, as you eventually probably will want to push
your changes somewhere, and then you need to have a symbolic reference in
the submodule(s) you have branched as well.
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: sub module branches
2010-03-08 11:14 sub module branches Mahesh Vaidya
2010-03-08 13:05 ` Peter Krefting
@ 2010-03-09 0:47 ` Avery Pennarun
1 sibling, 0 replies; 3+ messages in thread
From: Avery Pennarun @ 2010-03-09 0:47 UTC (permalink / raw)
To: Mahesh Vaidya; +Cc: git
On Mon, Mar 8, 2010 at 6:14 AM, Mahesh Vaidya <forvaidya@gmail.com> wrote:
> I have a situation like
>
> project/source.git
> /submod_1
> /submod_2
>
> I need to modify code in all 3 repos viz. source, submod_1 & submod_2.
>
> If I create branch in source, will it propogate to remaining
> submodules ? or in other words can I have "global branch" and "global
> tag"
You could use git-subtree instead: http://github.com/apenwarr/git-subtree
That will allow you to branch all the repos at once. It slightly
increases the effort required to extract the changes and submit them
upstream again, though.
Have fun,
Avery
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-09 12:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-08 11:14 sub module branches Mahesh Vaidya
2010-03-08 13:05 ` Peter Krefting
2010-03-09 0:47 ` Avery Pennarun
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).