From: Matthias Lederhofer Date: Sun, 18 Mar 2007 12:18:10 GMT Subject: Re: [RFH] straightening out "read-tree -m" Message-ID: <20070318121810.GA17807@moooo.ath.cx> In-Reply-To: <7vtzwjnhcb.fsf@assigned-by-dhcp.cox.net> Junio C Hamano wrote: > A B Outcome > ---------------------------------------------------------------- > D D No problem. > > D F This should result in refusal when there are > local modification to paths in "foo" directory, > or there are untracked (but unignored) paths in > "foo/". What about ignored configuration files like config.mak? Let's say there is an ignored configuration file in a subdirectory. If this subdirectory is replaced by a file git would delete the ignored configuration file?