From: Junio C Hamano Date: Wed, 28 May 2008 23:39:27 GMT Subject: Re: [PATCH] Completion: Hint whether amend is the right thing to do. Message-ID: <7vlk1urob4.fsf@gitster.siamese.dyndns.org> In-Reply-To: <200805290133.48490.robin.rosenberg.lists@dewire.com> Robin Rosenberg writes: > onsdagen den 28 maj 2008 17.53.40 skrev Junio C Hamano: >> Does this mean that it would help reduce mistakes if "git commit --amend" >> noticed the presense of .dotest-merge but absense of .dotest-merge/amend >> and refused to operate, I have to wonder? > > Well I found myself making these mistakes. That would probably be better. > Shouldn't one block commit without amend too then? If you mean to forbid "git commit" during rebase (perhaps interrupted by s/pick/edit/), I do not think that would fly -- it is the advertised way to split a commit into two, if I am not mistaken.