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

Re: [PATCH] merge, pull: stop advising 'commit -a' in case of conflict

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Aug 29, 2014, 06:44 UTC
Message-ID
<vpqegvzu75y.fsf@anie.imag.fr>
In-Reply-To
<xmqqppfka2bb.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
> Here is how I phrased in the one queued tentatively.
OK with me, thanks,
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Junio C HamanoNext: Stefan Beller
Message 9 of 11 in “[RFC] improving advice message from "git commit" during a merge”
  1. Junio C HamanoAug 27, 2014
  2. Jeff KingAug 27, 2014
  3. Junio C HamanoAug 27, 2014
  4. merge, pull: stop advising 'commit -a' in case of conflictMatthieu Moy, Aug 28, 2014
  5. Junio C HamanoAug 28, 2014
  6. Matthieu MoyAug 28, 2014
  7. Jonathan NiederAug 28, 2014
  8. Junio C HamanoAug 28, 2014
  9. Matthieu MoyAug 29, 2014
  10. Stefan BellerAug 28, 2014
  11. Junio C HamanoAug 28, 2014

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.