submodule mistake and a problem

2012-10-01 Thread Howard Miller
Hi, I did this and now am confused/stuck... - I have an existing (long standing) project in git with an upstream in github - I added a subdirectory which I had forgotten was itself a git project (i.e. it has its own .git directory) - I committed the subdirectory (git add /path/to/subdir; git

Re: submodule mistake and a problem

2012-10-01 Thread Johannes Sixt
Am 10/1/2012 12:41, schrieb Howard Miller: - I have an existing (long standing) project in git with an upstream in github - I added a subdirectory which I had forgotten was itself a git project (i.e. it has its own .git directory) - I committed the subdirectory (git add /path/to/subdir; git

Re: submodule mistake and a problem

2012-10-01 Thread 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

Re: submodule mistake and a problem

2012-10-01 Thread Jens Lehmann
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

Re: submodule mistake and a problem

2012-10-01 Thread Howard Miller
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.lehm...@web.de 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