From: Mark Levedahl <mlevedahl@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Sixt <j.sixt@viscovery.net>, git@vger.kernel.org
Subject: Re: [PATCH 1/2] commit.c - provide commit-type to the hooks/pre-commit script
Date: Mon, 07 Jun 2010 22:55:27 -0400 [thread overview]
Message-ID: <4C0DB11F.90904@gmail.com> (raw)
In-Reply-To: <20100607063817.GA23361@coredump.intra.peff.net>
On 06/07/2010 02:38 AM, Jeff King wrote:
> Actually, I meant to provide the hook with the literal words "HEAD~1"
> and "HEAD", not the sha1. So they are effectively magic words, but they
> also happen to be useful for directly feeding to git commands.
>
> It also extends naturally to indicating a merge commit ("HEAD" or
> "HEAD~1" followed by some other ref). I don't know if that is useful or
> not, but it seems like the same realm of information as whether or not
> we are amending.
>
> -Peff
>
>
I agree with this, though I have no itch regarding all of the commit
parents for a merge commit so I'll leave that for another to scratch.
So, I'm sending a new series to use HEAD~1 and HEAD rather than amend
and normal.
Mark
prev parent reply other threads:[~2010-06-08 2:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 17:39 [PATCH 1/2] commit.c - provide commit-type to the hooks/pre-commit script Mark Levedahl
2010-06-05 17:43 ` [PATCH 2/2] git-gui " Mark Levedahl
2010-06-06 22:10 ` [PATCH 1/2] commit.c " Jeff King
2010-06-07 0:21 ` Mark Levedahl
2010-06-07 6:26 ` Johannes Sixt
2010-06-07 6:38 ` Jeff King
2010-06-08 2:55 ` Mark Levedahl [this message]
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=4C0DB11F.90904@gmail.com \
--to=mlevedahl@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=peff@peff.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.
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).