summaryrefslogtreecommitdiff
path: root/tools/move.sh
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-08-17 20:19:57 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-08-17 20:19:57 -0400
commitf6fb0e626c492d854f21f3f91cefd288bd21d346 (patch)
treeeb0a3fcb6932b1d07a1598c2d9d9d607864cfc0c /tools/move.sh
parent50b1e92bb07c296befdaa3d0d9158882bd3e1146 (diff)
better git ref names
Diffstat (limited to 'tools/move.sh')
-rwxr-xr-xtools/move.sh10
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 "$@"