From: Johannes Sixt Date: Thu, 22 Jan 2009 07:28:44 GMT Subject: Re: Short "git commit $file" syntax fails in the face of a resolved conflict Message-ID: <4978202C.3090703@viscovery.net> In-Reply-To: Please don't top-post. Nathan Yergler schrieb: > Can you elaborate on why doing -i automatically is a bad idea in this > case? [It may really be, I don't pretend to have enough knowledge > about git's internals to make a reasoned argument.] This was > unexpected behavior for me as I'd always experienced "git add path && > git commit" and "git commit path" as being equivalent and so I assumed > they would work equivalently in this situation. They are not equivalent. 'git add path && git commit' commits changes to path *in addition* to what is already staged before you run this command sequence. But 'git commit path' commits *only* changes to path, leaving other changes that might be staged uncommitted. It may become obvious why the latter behavior is unwanted if a merge is in progress: The merge left changes (and conflicts) in the index; but with 'git commit path' you say that you are not interested in what the index has. -- Hannes