From 7189c344efe24bcb330556f780b07f87f75368ba Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 31 Jul 2013 17:25:52 +0200 Subject: [PATCH] dashtopatch: git: +--no-edit --- bin/dashtopatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 1.8.3.1