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

[RFC/PATCH 0/5] WIP status/rerere reporting

From
EWEric Wong <normalperson@yhbt.net>
Date
Dec 8, 2006, 10:49 UTC
Message-ID
<1165574970740-git-send-email-normalperson@yhbt.net>
In-Reply-To
<20061205092126.GE27236@soma>

This is the stuff I mentioned I had been working on several months before in a reply to the git-explain/git-wtf/git-whatsup thread.

I've rebased it against the current master and everything still seems to work (I don't have unit tests for them).

This has been forgotten and abandoned for a while. I especially don't expect the changes to git-commit.sh (status) to be applied as-is, as it should go into the new runstatus (my work predates runstatus).

 git-am.sh       |   18 ++++++++++++++----
 git-commit.sh   |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 git-rebase.sh   |   43 ++++++++++++++++++++++++++++++-------------
 git-rerere.perl |   25 +++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 18 deletions(-)

[PATCH 1/5] rerere: avoid misrecording on a skipped or aborted rebase/am [PATCH 2/5] status: show files that would have resolutions recorded by rerere [PATCH 3/5] am and rebase resolve states get picked up by status/commit [PATCH 4/5] am: run git rerere to record resolution on successful --resolved [PATCH 5/5] rerere: add the diff command

Previous: Eric WongNext: Eric Wong
Message 2 of 10 in “Re: [PATCH] git-explain”
  1. Eric WongDec 5, 2006
  2. 0/5 WIP status/rerere reportingEric Wong, Dec 8, 2006
  3. 1/5 rerere: avoid misrecording on a skipped or aborted rebase/amEric Wong, Dec 8, 2006
  4. Junio C HamanoDec 8, 2006
  5. 6/5 git-rerere: document the 'clear' and 'diff' commandsEric Wong, Dec 8, 2006
  6. 2/5 status: show files that would have resolutions recorded by rerereEric Wong, Dec 8, 2006
  7. 3/5 am and rebase resolve states get picked up by status/commitEric Wong, Dec 8, 2006
  8. 4/5 am: run git rerere to record resolution on successful --resolvedEric Wong, Dec 8, 2006
  9. 5/5 rerere: add the diff commandEric Wong, Dec 8, 2006
  10. Jakub NarebskiDec 8, 2006

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.