> What should happen if the user did these instead, after adding "dir" as an > ignored entry, and adding dir/file but not dir/untracked to the index? > > (1) git add dir/file dir/untracked ; explicitly named > (2) git add dir/* ; have shell glob--same as (1) > (3) git add "dir/*" ; have git glob > (4) git add dir ; have git recurse In all four cases, the output I get is: """ The following paths are ignored by one of your .gitignore files: dir Use -f if you really want to add them. fatal: no files added """ Note that this is also the output if you run (5) rm dir/untracked && git add "dir/*" Greg -- 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