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

Re: git mergetool broken when rerere active

From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date
Jan 6, 2011, 19:51 UTC
Message-ID
<AANLkTimOzwaw6VN+NPfCJPH9t0G64r=WrffNpfHQ0h-F@mail.gmail.com>
In-Reply-To
<7v62u1bzeg.fsf@alter.siamese.dyndns.org>
On Thu, Jan 6, 2011 at 2:33 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Probably we would need a "git rerere remaining" sobcommand that is similar
>> to status but also includes the "punted" paths.
>
> ... which may look like this.
Thanks! Will have a look at this tonight when I get home.
Previous: Junio C HamanoNext: Martin von Zweigbergk
Message 5 of 6 in “git mergetool broken when rerere active”
  1. Martin von ZweigbergkJan 6, 2011
  2. Martin von ZweigbergkJan 6, 2011
  3. Junio C HamanoJan 6, 2011
  4. Junio C HamanoJan 6, 2011
  5. Martin von ZweigbergkJan 6, 2011
  6. Martin von ZweigbergkJan 7, 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.