summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-10-26 22:49:09 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-10-26 22:49:09 -0400
commit2b1abe52835e2f9a85657009b3432cf2c2bdc417 (patch)
tree9fb8b105724de23a386377ca83c6035eb423f1f2 /tools
parent62462bb9d7d0866d320d449a77b65c8a011ec813 (diff)
tools/notsd-move: oops: don't invoke the editor, for real this time
Diffstat (limited to 'tools')
-rwxr-xr-xtools/notsd-move4
1 files changed, 2 insertions, 2 deletions
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
}