I was not aware of git subtree. I'll go and do some reading. Thanks for the pointer! On 1 October 2012 17:40, Jens Lehmann <Jens.Lehmann@xxxxxx> wrote: > > Am 01.10.2012 14:05, schrieb Howard Miller: > >> > >> Perhaps: > >> > >> git rm -f --cached path/to/subdir # remove from index, keep files > >> git add path/to/subdir > >> > >> -- Hannes > > > > Fantastic.... worked perfectly. I'll write that down somewhere for > > the next time I do it :) > > > > Is there a better way of handling sub-modules like that? I've looked > > at git submodules but just got into more of a mess. It would be nice > > to push a project complete with a (git) submodule upstream but it > > seems tricky or impossible. > > Git submodules are distinct repositories by design, so you'd have to > create an upstream repository for the submodule too to make that work. > But I have the impression that you want to import another repository > into a directory of your repo, so maybe git subtree is what you want. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html