From: Eric Sunshine Date: Fri, 20 Apr 2018 19:34:16 GMT Subject: Re: [PATCH 2/3] sequencer: leave a tell-tale when a fixup/squash failed Message-ID: In-Reply-To: <4f87b8ea2c47b45107e2ba1cdd6d04a66fea0d16.1524226637.git.johannes.schindelin@gmx.de> On Fri, Apr 20, 2018 at 8:18 AM, Johannes Schindelin wrote: > In the upcoming patch to clean up fixup/squash commit messages even when > skipping a final fixup/squash that failed with merge conflicts, we will > need to have some indicator what happened. > > As we need to remove the message-fixup and message-squash files upon > failure, we cannot use those. So let's just write an explicit amend-type > file, containing either `fixup` or `squash`. The absence of that file > indicates that the we were not in the middle of a fixup or squash when s/the we/we/ > merge conflicts were happening. > > Signed-off-by: Johannes Schindelin