[PATCH 4/5] am: run git rerere to record resolution on successful --resolved
From: Eric Wong <hidden>
Date: 2016-08-11 19:51:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Eric Wong <redacted> --- 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