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

Re: Redoing a merge for a particular file

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 8, 2011, 00:37 UTC
Message-ID
<7v62ndhajm.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAFOYHZBBtqK2VtZ-Bq3uMAhGD4esSz7JDJn_4xaKb4y8wt9LJA@mail.gmail.com>
Chris Packham <judge.packham@gmail.com> writes:
> Perhaps checkout --merge <path> should automagically tell rerere to
> forget about the path?
NOOOOOOOO. Please don't.
Previous: Chris PackhamNext: Junio C Hamano
Message 4 of 5 in “Redoing a merge for a particular file”
  1. Chris PackhamJul 7, 2011
  2. Jeff KingJul 7, 2011
  3. Chris PackhamJul 7, 2011
  4. Junio C HamanoJul 8, 2011
  5. Junio C HamanoJul 8, 2011

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.