summaryrefslogtreecommitdiff
path: root/tools/notsd-move
diff options
context:
space:
mode:
Diffstat (limited to 'tools/notsd-move')
-rwxr-xr-xtools/notsd-move2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/notsd-move b/tools/notsd-move
index a2190bac64..fcb9eaff4b 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -852,7 +852,7 @@ main() {
git commit -m './tools/notsd-move'
git merge -s ours notsystemd/postmove
git checkout notsystemd/postmove
- git merge tmp/postmove
+ git merge --no-edit tmp/postmove
git branch -d tmp/postmove
}