That should be in .gitmodules of your main project?
On 01/22/2014 08:41 PM, Chuck McManis wrote:
> Ok, sorry to be a pain, this works great. Except now I thought I'll do
> this with my libopencm3-examples fork which has as a sub-repo
> libopencm3. Sitting in libopencm3-examples my git status is :
>
> cmcmanis@mint:/filer/cmcmanis/arm-experiments/libopencm3-examples$ git
> status
> # On branch master
> # Your branch is ahead of 'origin/master' by 1 commit.
> # (use "git push" to publish your local commits)
> #
> # Changes not staged for commit:
> # (use "git add <file>..." to update what will be committed)
> # (use "git checkout -- <file>..." to discard changes in working
> directory)
> #
> # modified: libopencm3 (new commits)
> #
> # Untracked files:
> # (use "git add <file>..." to include in what will be committed)
> #
> # examples/stm32/f4/stm32f4-disco/
> # examples/stm32/f4/stm32f4-discovery/adatft/
> # examples/stm32/f4/stm32f4-discovery/bb-sd/
> # examples/stm32/f4/stm32f4-discovery/bb-usart/
> # examples/stm32/f4/stm32f4-discovery/bbmon/
> # examples/stm32/f4/stm32f4-discovery/fancy-usart/
> # examples/stm32/f4/stm32f4-discovery/hello/
> # examples/stm32/f4/stm32f4-discovery/lcd/
> # examples/stm32/f4/stm32f4-discovery/newlib-nano-1.0/
> # examples/stm32/f4/stm32f4-discovery/spi/
> # examples/stm32/f4/stm32f4-discovery/uart-driver/
> # examples/stm32/f4/stm32f4-discovery/usart/usart-plus.c
> # examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq_chuck.c
> # examples/stm32/f4/stm32f4-discovery/usart_irq_buf/
> no changes added to commit (use "git add" and/or "git commit -a")
>
> Notice how it says "libopencm3 (new commits)" but if I go to the sub-dir
>
> cmcmanis@mint:/filer/cmcmanis/arm-experiments/libopencm3-examples/libopencm3$
> git status
> # On branch master
> nothing to commit, working directory clean
>
> Which says there isn't anything to commit.
>
> So where does git keep information about its submodules (I found
> ../.git/modules/libopencm3/config but I can't figure out where the
> -example repo keeps what it thinks is the 'right' branch/commit for
> this sub module)
>
> --Chuck
>
>
>
> On Wed, Jan 22, 2014 at 11:26 AM, Chuck McManis
> <[email protected] <mailto:[email protected]>> wrote:
>
> Awesome, revisiting that page now that I have a lot more
> experience running around inside of git it made a lot of sense.
> The fetch/merge of upstream did what I wanted. Thanks Jason!
>
> --Chuck
>
>
> On Wed, Jan 22, 2014 at 11:17 AM, Jason Kotzin
> <[email protected] <mailto:[email protected]>> wrote:
>
> This could help:
>
> https://help.github.com/articles/fork-a-repo
>
> 'git remote add upstream
> https://github.com/libopencm3/libopencm3.git'
>
> Sincerely,
> Jason
>
> On Jan 22, 2014, at 11:14 AM, Chuck McManis
> <[email protected] <mailto:[email protected]>> wrote:
>
> > I'm getting quite annoyed with git.
> >
> > So I've got a repo on github which is a 'fork' of libopencm3
> which I really expect to be a remote tracking repo. I clone my
> 'fork' to create a development repo on my linux machine.
> >
> > So changes I make to my local repo, I can push to the fork
> on github and then generate a pull request.
> >
> > But now the libopencm3 repo I'm tracking gets a commit. And
> I want to pull that into my 'fork' so that I can pull it into
> my local repo.
> >
> > "git remote fetch" doesn't exist. There isn't a UI element
> on Github to fetch/merge from the remote branch that I can find.
> >
> > It is very frustrating. I've to my 429 changes stuck in a
> 'fork' which is no behind the primary libopencm3 and am unable
> to get it to fetch/merge from libopencm3 so that I can rebase
> my changes to the current code!
> >
> > --Chuck
> >
>
> ------------------------------------------------------------------------------
> > CenturyLink Cloud: The Leader in Enterprise Cloud Services.
> > Learn Why More Businesses Are Choosing CenturyLink Cloud For
> > Critical Workloads, Development Environments & Everything In
> Between.
> > Get a Quote or Start a Free Trial Today.
> >
>
> http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk_______________________________________________
> > libopencm3-devel mailing list
> > [email protected]
> <mailto:[email protected]>
> > https://lists.sourceforge.net/lists/listinfo/libopencm3-devel
>
>
>
>
>
> ------------------------------------------------------------------------------
> CenturyLink Cloud: The Leader in Enterprise Cloud Services.
> Learn Why More Businesses Are Choosing CenturyLink Cloud For
> Critical Workloads, Development Environments & Everything In Between.
> Get a Quote or Start a Free Trial Today.
> http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
>
>
> _______________________________________________
> libopencm3-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/libopencm3-devel
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
libopencm3-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/libopencm3-devel
