blob: 43b7610efc51f3876778c0d92387d7703d634cdc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
#!/bin/bash
# This script is licensed under BSD-3
export PORTAGE_BIN_PATH="/usr/lib/portage/python2.7"
if [[ -f "${PORTAGE_BIN_PATH}"/isolated-functions.sh ]]; then
. "${PORTAGE_BIN_PATH}"/isolated-functions.sh
else
alias ebegin=echo
alias eend=true
fi
ebegin "Starting from master"
echo
git checkout master || exit; _ret=$?
echo
eend ${_ret}
ebegin "Fetching everything"
echo
git fetch --all -v || exit; _ret=$?
echo
eend ${_ret}
ebegin "Merging github"
echo
git merge -v github/master || exit; _ret=$?
echo
eend ${_ret}
ebegin "Pushing to g.o.g.o"
git push -v origin || exit; _ret=$?
echo
eend ${_ret}
ebegin "Branching out github"
echo
git checkout -b github-merging github/master || exit; _ret=$?
echo
eend ${_ret}
ebegin "Merging in g.o.g.o"
echo
git merge -v origin/master || exit; _ret=$?
echo
eend ${_ret}
ebegin "Pushing to github"
echo
git push -v github HEAD:master || exit; _ret=$?
echo
eend ${_ret}
ebegin "Going back to master"
echo
git checkout master || exit; _ret=$?
echo
eend ${_ret}
ebegin "Removing github branch"
echo
git branch -v -D github-merging || exit; _ret=$?
echo
eend ${_ret}
|