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

Re: [PATCH 0/3] Update advice in commit/status output

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 12, 2009, 18:27 UTC
Message-ID
<7vws0st5e2.fsf@alter.siamese.dyndns.org>
In-Reply-To
<fabb9a1e0912120813h1c41b7bfg4525f8f01e04ddb1@mail.gmail.com>
Sverre Rabbelier <srabbelier@gmail.com> writes:
Show 7 quoted lines
> Heya,
>
> On Sat, Dec 12, 2009 at 10:02, Junio C Hamano <gitster@pobox.com> wrote:
>> In neither case, "git reset HEAD <path>" is absolutely a wrong thing to do
>> while merging.
>
>>From the patches I'm guessing you mean "In either case" instead?
Correct.
Previous: Sverre RabbelierNext: Jay Soffian
Message 9 of 10 in “Update advice in commit/status output”
  1. 0/3 Update advice in commit/status outputJunio C Hamano, Dec 12, 2009
  2. 1/3 commit/status: check $GIT_DIR/MERGE_HEAD only onceJunio C Hamano, Dec 12, 2009
  3. 2/3 commit/status: "git add <path>" is not necessarily how to resolveJunio C Hamano, Dec 12, 2009
  4. 3/3 status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano, Dec 12, 2009
  5. Jeff KingDec 12, 2009
  6. Junio C HamanoDec 12, 2009
  7. Nanako ShiraishiDec 12, 2009
  8. Sverre RabbelierDec 12, 2009
  9. Junio C HamanoDec 12, 2009
  10. Jay SoffianDec 12, 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.