From 2b1abe52835e2f9a85657009b3432cf2c2bdc417 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 22:49:09 -0400 Subject: tools/notsd-move: oops: don't invoke the editor, for real this time --- tools/notsd-move | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/notsd-move b/tools/notsd-move index 4a5630c777..c7a9b99e0b 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -852,9 +852,9 @@ main() { git add . git commit -m './tools/notsd-move' - git merge -s ours notsystemd/postmove + git merge --no-edit -s ours notsystemd/postmove git checkout notsystemd/postmove - git merge --no-edit tmp/postmove + git merge tmp/postmove git branch -d tmp/postmove } -- cgit v1.2.3-54-g00ecf