summaryrefslogtreecommitdiff
path: root/tools/notsd-move
diff options
context:
space:
mode:
Diffstat (limited to 'tools/notsd-move')
-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
}