From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] hooks/pre-commit: add example to add Signed-off-by line to message
Date: Wed, 20 Dec 2006 18:37:45 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.63.0612201835570.19693@wbgn013.biozentrum.uni-wuerzburg.de> (raw)
In-Reply-To: <7vmz5ifpbv.fsf@assigned-by-dhcp.cox.net>
Hi,
On Wed, 20 Dec 2006, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Hi,
> >
> > On Wed, 20 Dec 2006, Andy Parkins wrote:
> >
> >> Signed-off-by: Andy Parkins <andyparkins@gmail.com>
> >
> > Acked-by: Johannes E. Schindelin <johannes.schindelin@gmx.de>
> >
> > Ciao,
> > Dscho
>
> Why SQUASH_MSG? Doesn't it confuse git-explain when it wants to
> detect that you are in the middle of a squash merge?
Yes, it confuses git-explain. Which did not existed when I concocted the
first (broken) version of this patch. There are only two ways to give
commit message templates AFAICT: misusing SQUASH_MSG and misusing
MERGE_MSG.
Ciao,
Dscho
next prev parent reply other threads:[~2006-12-20 17:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-29 11:20 [PATCH] hooks/pre-commit: add example to add Signed-off-by line to message Johannes Schindelin
2006-12-20 15:54 ` Andy Parkins
2006-12-20 16:04 ` Andy Parkins
2006-12-20 16:18 ` Johannes Schindelin
2006-12-20 17:29 ` Junio C Hamano
2006-12-20 17:37 ` Johannes Schindelin [this message]
2006-12-20 17:44 ` Junio C Hamano
2006-12-21 8:26 ` Johannes Schindelin
2006-12-21 9:24 ` [PATCH] hooks/commit-msg: " Andy Parkins
2006-12-22 5:45 ` Junio C Hamano
2006-12-22 9:28 ` Andy Parkins
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.63.0612201835570.19693@wbgn013.biozentrum.uni-wuerzburg.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).