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

Re: [PATCH] git-merge: do up-to-date check also for strategies ours, subtree.

From
Jeff King <peff@peff.net>
Date
Aug 10, 2007, 00:01 UTC
Message-ID
<20070810000126.GB10250@sigill.intra.peff.net>
In-Reply-To
<7v3aysxvk3.fsf@assigned-by-dhcp.cox.net>
On Thu, Aug 09, 2007 at 02:11:24PM -0700, Junio C Hamano wrote:
Show 5 quoted lines
> Right now I do not have time to dig mailing list archive around
> mid March 2006, and I do not recall the requestor's original
> rationale, but I have a vague recollection that we added this
> "no fast-forward check" specifically in response to a user
> request.

Maybe it was the "I'm using a custom merge strategy that might refuse the merge, but fast-forwards don't even invoke my merge strategy" request?

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 7 in “git-merge: do up-to-date check also for strategies ours, subtree.”
  1. git-merge: do up-to-date check also for strategies ours, subtree.Gerrit Pape, Aug 9, 2007
  2. Junio C HamanoAug 9, 2007
  3. Jeff KingAug 10, 2007
  4. Junio C HamanoAug 10, 2007
  5. Junio C HamanoAug 10, 2007
  6. Gerrit PapeAug 10, 2007
  7. git-merge: do up-to-date check also for all strategiesJunio C Hamano, Aug 16, 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.