From: Junio C Hamano <gitster@pobox•com>
To: "Josh England" <jjengla@sandia•gov>
Cc: "Junio C Hamano" <gitster@pobox•com>, git@vger•kernel.org
Subject: Re: [PATCH] Add post-merge hook.
Date: Tue, 04 Sep 2007 13:03:20 -0700 [thread overview]
Message-ID: <7vodgimc53.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1188934573.6192.35.camel@beauty> (Josh England's message of "Tue, 04 Sep 2007 13:36:13 -0600")
"Josh England" <jjengla@sandia•gov> writes:
> On Tue, 2007-09-04 at 10:25 -0700, Junio C Hamano wrote:
>> "Josh England" <jjengla@sandia•gov> writes:
>>
>> >> Two questions.
>> >>
>> >> * Do you want to run the post-merge hook even for a squash
>> >> merge?
>> >
>> > Yes. I'd like to run it at any time that the working tree might be
>> > updated.
>>
>> If that is the case, perhaps your hook may want to get a
>> parameter to tell it what kind of "git-merge" invocation it was?
>> Squash merge does not even advance the HEAD and is of a very
>> different nature from a normal merge.
>
> OK. Should it just pass in a flag (squash or normal), or are there
> other merge types it should need to know about.
I suspect you have thought abuot the issues involved longer than
I have ;-), so you should take whatever I say with grain of
salt, but I think you would also want to know fast-forwards and
up-to-dates if the hook wants to be generic, not "for Josh's
workflow only".
next prev parent reply other threads:[~2007-09-04 20:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-30 22:40 [PATCH] Add post-merge hook jjengla
2007-08-30 23:07 ` Junio C Hamano
2007-09-04 16:25 ` Josh England
2007-09-04 17:25 ` Junio C Hamano
2007-09-04 19:36 ` Josh England
2007-09-04 20:03 ` Junio C Hamano [this message]
2007-09-04 20:32 ` Josh England
2007-09-04 20:52 ` Steven Grimm
2007-09-04 21:23 ` Josh England
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=7vodgimc53.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jjengla@sandia$(echo .)gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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