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

Re: [PATCH 5/5] rerere: add the diff command

From
Jakub Narebski <jnareb@gmail.com>
Date
Dec 8, 2006, 12:07 UTC
Message-ID
<elbkdl$og4$2@sea.gmane.org>
In-Reply-To
<1165574977365-git-send-email-normalperson@yhbt.net>
Eric Wong wrote:
Show 7 quoted lines
> Sometimes I like to see what I'm recording resolutions for and
> what's changed during a resolution.
> 
> Signed-off-by: Eric Wong <normalperson@yhbt.net>
> ---
>  git-rerere.perl |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
Documentation, please?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Eric Wong
Message 10 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.