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

Re: [RFC/PATCH 2/2] builtin-merge: show user-friendly error messages for fast-forward too.

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Nov 30, 2009, 08:42 UTC
Message-ID
<vpq3a3wtncm.fsf@bauges.imag.fr>
In-Reply-To
<7vy6lo7nu8.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 7 quoted lines
> Matthieu Moy <Matthieu.Moy@imag.fr> writes:
>
>> This is where I'm not 100% sure I'm not breaking some plumbing.
>
> I think this change is safe [...]
>
> Or did you have something a lot more subtle in mind?

Not at all. But since I found the place to add my code more or less randomly with gdb, I feel safer with your comment ;-).

Thanks,
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Junio C Hamano
Message 5 of 5 in “User-friendly error messages for merge failure on fast-forward.”
  1. 0/2 User-friendly error messages for merge failure on fast-forward.Matthieu Moy, Nov 29, 2009
  2. 1/2 merge-recursive: make the error-message generation an extern functionMatthieu Moy, Nov 29, 2009
  3. 2/2 builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy, Nov 29, 2009
  4. Junio C HamanoNov 30, 2009
  5. Matthieu MoyNov 30, 2009

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.