From: Junio C Hamano Date: Sun, 29 Jan 2006 23:50:19 GMT Subject: Re: No merge strategy handled the merge (git version 1.1.GIT) Message-ID: <7vhd7mh9vo.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <43DD52ED.7090503@drugphish.ch> Roberto Nibali writes: > ... "not reading code before commenting" omitted ... > On top of that "-D" did/does > not seem to be documented... Well, initially, not documenting it was done somewhat deliberately, because -D is an operation that would lose information. Running the command with -d option would reveal its existence after telling the user why we do not let it be deleted by default.