X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fdashtopatch;h=73952a0ad846b363dbe42e2c7435485646a74515;hp=c48fad673de0d7cca62202f51d3da39298c546b0;hb=7189c344efe24bcb330556f780b07f87f75368ba;hpb=032f69ac06688a21beeb87ce2e526ec5a8ab56f3

diff --git a/bin/dashtopatch b/bin/dashtopatch
index c48fad6..73952a0 100755
--- a/bin/dashtopatch
+++ b/bin/dashtopatch
@@ -24,7 +24,7 @@ for elem in $(echo "$1"|tr '-' ' ');do
     next="$base-$elem"
   fi
   git checkout "$next"
-  git merge "$base"
+  git merge --no-edit "$base"
   if $compile;then
     make
   fi