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

Edit a rerere conflict resolution

From
Vincent van Ravesteijn <vfr@lyx.org>
Date
Mar 12, 2012, 19:14 UTC
Message-ID
<4F5E4B20.5080709@lyx.org>
Hi all,

Would it be a useful addition to have a command 'git rerere edit <path> <commit>' ?

This would allow the user to edit the conflict resolution which was used in a certain commit (merge, rebase.. ).

Now I tend to grep in the .git/rr-cache directory, because I don't want to do 'git rerere forget' as this would require me to refix more resolution than needed.

Vincent
Next: Junio C Hamano
Message 1 of 16 in “Edit a rerere conflict resolution”
  1. Vincent van RavesteijnMar 12, 2012
  2. Junio C HamanoMar 12, 2012
  3. Vincent van RavesteijnMar 12, 2012
  4. Junio C HamanoMar 12, 2012
  5. Vincent van RavesteijnMar 12, 2012
  6. Junio C HamanoMar 12, 2012
  7. Vincent van RavesteijnMar 12, 2012
  8. Jakub NarebskiMar 12, 2012
  9. Junio C HamanoMar 12, 2012
  10. Vincent van RavesteijnMar 16, 2012
  11. Junio C HamanoMar 16, 2012
  12. Vincent van RavesteijnMar 16, 2012
  13. Junio C HamanoMar 16, 2012
  14. Vincent van RavesteijnMar 16, 2012
  15. Junio C HamanoMar 16, 2012
  16. Vincent van RavesteijnMar 17, 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.