Willy-JL 2 år sedan
förälder
incheckning
f1f0d8fd51
1 ändrade filer med 1 tillägg och 1 borttagningar
  1. 1 1
      .utils/subtree-subdir-helper.sh

+ 1 - 1
.utils/subtree-subdir-helper.sh

@@ -23,6 +23,6 @@ git checkout "${prev}"
 exec 69>&1
 result="$(git subtree "${action}" -P "${path}" "${split}" -m "${action^} ${path} from ${repo}" 2>&1 | tee /proc/self/fd/69)"
 if grep "refusing to merge unrelated histories" <<< "$result" > /dev/null; then
-    echo "History at ${repo} is unrelated, using quash..."
+    echo "History at ${repo} is unrelated, using squash..."
     git subtree "${action}" -P "${path}" "${split}" -m "${action^} ${path} from ${repo}" --squash
 fi