Ahh, the joys of working with a new revision control system. When I was just about ready to commit some code, git tells me I've gotta add it.
Sure, that sounds fine and dandy, except I pressed tab and accidently added a trailing "/", committing the folder's contents rather than the folder itself (yeah I know, weird aye?)
So instead of having:
modified: folder
I had:
deleted: folder
new file: folder/.gitignore
new file: folder/__init__.py
new file: folder/models.py
new file: folder/views.py
Shit! I dont want to delete half a days worth of work! Luckily, to undo this AND keep your changes, simply type:
git reset HEAD drupal_glue