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

[PATCH v2 0/2] stash: invoke rerere in case of conflict

From
Phil Hord <hordp@cisco.com>
Date
Jul 7, 2012, 20:46 UTC
Message-ID
<1341693962-17090-1-git-send-email-hordp@cisco.com>
In-Reply-To
<CABURp0oXhZ5ysm4b3Z=7o+2TB+3wFdMjj4oEwxafApjD4c7ozA@mail.gmail.com>

[PATCH v2 1/2] test: git-stash conflict sets up rerere A rewritten failing test to verify rerere is used during 'stash apply' conflicts.

[PATCH v2 2/2] stash: invoke rerere in case of conflict The fix (written entirely by JCH) and switched the test to expect success.

Previous: Phil HordNext: Phil Hord
Message 6 of 13 in “stash: Delete MERGE_RR before stash apply”
  1. stash: Delete MERGE_RR before stash applyPhil Hord, Jul 5, 2012
  2. Junio C HamanoJul 5, 2012
  3. Phil HordJul 6, 2012
  4. Junio C HamanoJul 6, 2012
  5. Phil HordJul 6, 2012
  6. 0/2 stash: invoke rerere in case of conflictPhil Hord, Jul 7, 2012
  7. 1/2 test: git-stash conflict sets up rererePhil Hord, Jul 7, 2012
  8. Junio C HamanoJul 9, 2012
  9. Phil HordJul 9, 2012
  10. Junio C HamanoAug 16, 2012
  11. Phil HordAug 17, 2012
  12. Junio C HamanoAug 17, 2012
  13. 2/2 stash: invoke rerere in case of conflictPhil Hord, Jul 7, 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.