diff options
Diffstat (limited to 'tools/move.sh')
| -rwxr-xr-x | tools/move.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/move.sh b/tools/move.sh index ef41e28c10..0e16dc771f 100755 --- a/tools/move.sh +++ b/tools/move.sh @@ -392,16 +392,16 @@ main() { exit 1 fi - git checkout -b postmove + git checkout -b tmp/postmove move git add . git commit -m './move.sh' - git merge -s ours lukeshu/postmove - git checkout lukeshu/postmove - git merge postmove - git branch -d postmove + git merge -s ours notsystemd/postmove + git checkout notsystemd/postmove + git merge tmp/postmove + git branch -d tmp/postmove } main "$@" |