Update repository name from zettio to weaveworks
This commit is contained in:
1 parent
580ffc4fa4
commit
8a82f368d0
32 files changed
+62
-62
No files matched your search
@@ -2,7 +2,7 @@
|
||||
set -e
|
||||
|
||||
# For info on why/how to use this script, see
|
||||
# https://github.com/zettio/weave/wiki/WorkingOnWeave#working-on-docs
|
||||
# https://github.com/weaveworks/weave/wiki/WorkingOnWeave#working-on-docs
|
||||
|
||||
MERGE_ARGS="-X subtree=site"
|
||||
|
||||
@@ -10,7 +10,7 @@ merge_dir=$(mktemp -d -t weave-merge.XXXXXX)/weave
|
||||
git clone -b gh-pages . $merge_dir
|
||||
|
||||
pushd $merge_dir
|
||||
git pull --ff-only git@github.com:zettio/weave gh-pages
|
||||
git pull --ff-only git@github.com:weaveworks/weave gh-pages
|
||||
git fetch origin master
|
||||
git merge $MERGE_ARGS -e -m "Merge master into gh-pages" origin/master
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
git push git@github.com:zettio/weave gh-pages:gh-pages
|
||||
git push git@github.com:weaveworks/weave gh-pages:gh-pages
|
||||
Reference in new issue
Block a user