git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Add post-merge hook.

From
JEJosh England <jjengla@sandia.gov>
Date
Sep 4, 2007, 19:36 UTC
Message-ID
<1188934573.6192.35.camel@beauty>
In-Reply-To
<7vmyw2ny05.fsf@gitster.siamese.dyndns.org>
On Tue, 2007-09-04 at 10:25 -0700, Junio C Hamano wrote:
Show 14 quoted lines
> "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.

-JE
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 9 in “Add post-merge hook.”
  1. Add post-merge hook.jjengla@sandia.gov, Aug 30, 2007
  2. Junio C HamanoAug 30, 2007
  3. Josh EnglandSep 4, 2007
  4. Junio C HamanoSep 4, 2007
  5. Josh EnglandSep 4, 2007
  6. Junio C HamanoSep 4, 2007
  7. Josh EnglandSep 4, 2007
  8. Steven GrimmSep 4, 2007
  9. Josh EnglandSep 4, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.