File tree 1 file changed +5
-3
lines changed
1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ export GIT_COMMITTER_EMAIL="$EMAIL"
14
14
15
15
DASHREMOTE=" $( git remote get-url origin) "
16
16
DOTREMOTE=" ${DASHREMOTE// -wiki/ .wiki} "
17
- echo " \$ DASHREMOTE = $DASHREMOTE , \$ DOTREMOTE = $DOTREMOTE "
17
+ echo " DASHREMOTE = $DASHREMOTE , DOTREMOTE = $DOTREMOTE "
18
18
19
19
for r in " $DASHREMOTE " " $DOTREMOTE " ; do
20
20
if [[ " $( git ls-remote --symref " $r " HEAD | grep " ^ref:" ) " \
@@ -23,13 +23,15 @@ for r in "$DASHREMOTE" "$DOTREMOTE"; do
23
23
fi
24
24
done
25
25
26
- echo " >>> Adding DOTREMOTE"
26
+ echo " >>> Adding and fetching DOTREMOTE"
27
27
git remote add dot " $DOTREMOTE "
28
28
git fetch dot
29
29
30
30
echo " >>> Merging changes"
31
31
git pull --no-edit --no-rebase dot " master"
32
32
33
- echo " >>> Pushing merges"
33
+ echo " >>> Pushing merges to DASHREMOTE "
34
34
git push origin
35
+
36
+ echo " >>> Pushing merges to DOTREMOTE"
35
37
git push dot
You can’t perform that action at this time.
0 commit comments