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

[PATCH 0/2] git-stash: clear rerere state on conflict

From
Phil Hord <hordp@cisco.com>
Date
Jul 6, 2012, 16:22 UTC
Message-ID
<1341591772-26251-1-git-send-email-hordp@cisco.com>

This patch series adds a failing test and then a fix for the condition discussed in these threads:

http://article.gmane.org/gmane.comp.version-control.git/177224 http://article.gmane.org/gmane.comp.version-control.git/201045 http://article.gmane.org/gmane.comp.version-control.git/200178/match=merge_rr

I previously floated this wrong-headed test after the same problem: http://article.gmane.org/gmane.comp.version-control.git/177231

[PATCH 1/2] test: mergetool ignores rerere in git-stash [PATCH 2/2] Clear rerere status during stash conflict

Next: Phil Hord
Message 1 of 3 in “git-stash: clear rerere state on conflict”
  1. 0/2 git-stash: clear rerere state on conflictPhil Hord, Jul 6, 2012
  2. 1/2 test: mergetool ignores rerere in git-stashPhil Hord, Jul 6, 2012
  3. 2/2 Clear rerere status during stash conflictPhil Hord, Jul 6, 2012

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.