From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 31 Jul 2013 15:25:52 +0000 (+0200)
Subject: dashtopatch: git: +--no-edit
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=7189c344efe24bcb330556f780b07f87f75368ba

dashtopatch: git: +--no-edit
---

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