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

[PATCH 4/5] am: run git rerere to record resolution on successful --resolved

From
EWEric Wong <normalperson@yhbt.net>
Date
Dec 8, 2006, 10:49 UTC
Message-ID
<11655749761154-git-send-email-normalperson@yhbt.net>
In-Reply-To
<20061205092126.GE27236@soma>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 git-am.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 179b967..d0714c6 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -414,6 +414,10 @@ do
 			stop_here_user_resolve $this
 		fi
 		apply_status=0
+		if test -d "$GIT_DIR/rr-cache"
+		then
+			git rerere
+		fi
 		;;
 	esac
 
-- 
1.4.4.2.g860f4
Previous: Eric WongNext: Eric Wong
Message 8 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.