On Fri, Nov 22, 2013 at 1:45 PM, christ...@surlykke.dk
<christ...@surlykke.dk> wrote:
> - but I think the fix is to run
>
> git submodule foreach git update master
>
> I am getting the hang of it now, I think. I avoid 'git submodule update' but
> do 'git submodule foreach git pull'. That seems to behave more like what I
> expect.
using:
git submodule update --remote --rebase
helps. If you are using git >= 1.8.2 (it can track branches) the
submodule HEAD will not be detached.
--rebase
This option is only valid for the update command. Rebase the current
branch onto the commit recorded in the superproject. If this option is
given, the submodule's HEAD will not be detached. If a merge failure
prevents this process, you will have to resolve these failures with
git-rebase(1). If the key submodule.$name.update is set to rebase,
this option is implicit.
--
Luís Pereira
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing
conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Lxde-list mailing list
Lxde-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxde-list
