X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-mergetool.sh;h=2f8dc441c6d575323f2fad920ecdb7b20e1445e6;hb=385cc9d8c44eb5be9d57e630129752a72c0a08c8;hp=e7fa67bd9c227b703dd4852c18b064463c8c92d6;hpb=af3147147f39274bd0d47faca196f84c4e9ec68d;p=git.git

diff --git a/git-mergetool.sh b/git-mergetool.sh
index e7fa67bd9..2f8dc441c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -264,9 +264,27 @@ merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo fa
 
 last_status=0
 rollup_status=0
+rerere=false
+
+files_to_merge() {
+    if test "$rerere" = true
+    then
+	git rerere status
+    else
+	git ls-files -u | sed -e 's/^[^	]*	//' | sort -u
+    fi
+}
+
 
 if test $# -eq 0 ; then
-    files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
+    cd_to_toplevel
+
+    if test -e "$GIT_DIR/MERGE_RR"
+    then
+	rerere=true
+    fi
+
+    files=$(files_to_merge)
     if test -z "$files" ; then
 	echo "No files need merging"
 	exit 0
@@ -275,10 +293,10 @@ if test $# -eq 0 ; then
     # Save original stdin
     exec 3<&0
 
-    echo Merging the files: "$files"
-    git ls-files -u |
-    sed -e 's/^[^	]*	//' |
-    sort -u |
+    printf "Merging:\n"
+    printf "$files\n"
+
+    files_to_merge |
     while IFS= read i
     do
 	if test $last_status -ne 0; then