From: Junio C Hamano <gitster@pobox.com>
To: Gerrit Pape <pape@smarden.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit
Date: Fri, 08 Feb 2008 02:03:12 -0800 [thread overview]
Message-ID: <7vsl03kbof.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080208095358.25666.qmail@b4daf7aef4dba9.315fe32.mid.smarden.org> (Gerrit Pape's message of "Fri, 8 Feb 2008 09:53:58 +0000")
Gerrit Pape <pape@smarden.org> 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.
next prev parent reply other threads:[~2008-02-08 10:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-08 9:53 [PATCH] builtin-commit: remove .git/SQUASH_MSG upon successful commit Gerrit Pape
2008-02-08 10:03 ` Junio C Hamano [this message]
2008-02-10 7:25 ` Junio C Hamano
2008-02-11 10:29 ` Gerrit Pape
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vsl03kbof.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pape@smarden.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).