Steven Grimm <koreth@xxxxxxxxxxxxx> writes: > $ mkdir dir > $ echo foo > dir/file > $ git add . > ... > Committing initial tree f4bc9c50d08b041f5e096fa68e243c34170f1cd8 > create mode 100644 dir/file > $ mv dir dir.real > $ ln -s dir.real dir > $ git add . > fatal: unable to add dir to index You didn't tell the index to remove dir/file. You cannot have dir and dir/file at the same time. - 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