Willy-JL 1 год назад
Родитель
Сommit
f51f43b96c
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      .utils/.check-merge.sh
  2. 1 1
      .utils/update-subtrees.sh

+ 1 - 1
.utils/.check-merge.sh

@@ -13,7 +13,7 @@ result="${3}"
 
 if grep "Automatic merge failed; fix conflicts and then commit the result." <<< "$result" > /dev/null; then
     echo "MERGE_MSG: Merge ${path} from ${repo}"
-    notify-send -a Git -i git "Subtree merge failed" "Resolve current index to continue" &> /dev/null | true
+    notify-send -t 0 -a Git -i git "Subtree merge failed" "Resolve current index to continue" &> /dev/null | true
     while true; do
         echo "Resolve current index then press Enter..."
         read

+ 1 - 1
.utils/update-subtrees.sh

@@ -30,4 +30,4 @@ for subtree in "${subtrees[@]}"; do
     done {remote}< "${subtree}"
 done
 
-notify-send -a Git -i git "Subtree update finished" "Double check merge commits" &> /dev/null | true
+notify-send -t 0 -a Git -i git "Subtree update finished" "Double check merge commits" &> /dev/null | true