From: Junio C Hamano Date: Fri, 08 Feb 2008 10:03:12 GMT Subject: Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit Message-ID: <7vsl03kbof.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org> Gerrit Pape writes: > After doing a merge --squash, and commit afterwards, the commit message > template SQUASH_MSG in the git directory is not removed, which means that > the content of SQUASH_MSG is used as default commit message for all > subsequent commits. So have git commit remove the file SQUASH_MSG from > the git directory upon a successful commit. It appears that there are a few more differences from what contrib/examples/git-commit.sh used to do. For example, the COMMIT_EDITMSG file used to be removed at around the same place as the SQUASH_MSG file.