diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-23 12:11:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-26 21:21:12 -0400 |
| commit | 77501fe72f21618fd6c290013b8151170f73247b (patch) | |
| tree | bd1ddd407c52ac0c0f750aefa5b7febbaba0535d /tools/notsd-move | |
| parent | 434b9800e88bcc9e451b4c4b709e61f5a6992f49 (diff) | |
tools/notsd-move: avoid invoking the editor for the merge commit
Diffstat (limited to 'tools/notsd-move')
| -rwxr-xr-x | tools/notsd-move | 2 |
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 } |