On Tue, Jan 07, 2014 at 07:47:08PM -0800, W. Trevor King wrote:
>     #git checkout --recurse-submodules master
>     ( # 'git checkout --recurse-submodules' doesn't exist yet [2,3].
>       # Even with that patch, 'git checkout' won't respect
>       # submodule.<name>.local-branch without further work.
>       git checkout master &&
>       cd submod &&
>       git checkout master  # don't pull in our my-feature work
>     )
>     git submodule update --remote &&
>     git commit -am 'Catch submod up with Subproject v2' &&
>     # update the my-feature branch
>     git checkout my-feature
>     ( # 'git checkout' doesn't mess with submodules
>       cd submod &&
>       git checkout my-feature
>     )

Oops, the my-feature checkout block should have been:

    #git checkout --recurse-submodules my-feature
    ( # 'git checkout --recurse-submodules' doesn't exist yet...
      git checkout my-feature &&
      cd submod &&
      git checkout my-feature
    )

mirroring the earlier master checkout block.  Sorry for the sloppy
editing.

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to