[tlug] git and sub-directories

[Darren Cook <darren@example.com>]

A quick tech question to take your mind off of the aftershocks :-)

$ git status
...
#	modified:   settings/tickfeeder.csv
...

$ cd settings
$ git status
...

I.e. no changed files. I got suspicious because I remember writing the
commit notice for the file it is says is modified.

I notice I have a .git subdirectory in both the top directory and the
settings subdirectory. I guess I did "git init" in the settings
directory first, then added the parent directory later.

So how do I (a git beginner) fix this mess? Just deleting settings/.git/
is bad as then I'd lose some commit history?

Yoroshiku,

Darren


-- 
Darren Cook, Software Researcher/Developer

http://dcook.org/work/ (About me and my work)
http://dcook.org/blogs.html (My blogs and articles)