diff --git a/scripts/upstream_sync.sh b/scripts/upstream_sync.sh index 611f6a45..cf150302 100755 --- a/scripts/upstream_sync.sh +++ b/scripts/upstream_sync.sh @@ -9,8 +9,8 @@ git checkout -b the-sacrifice mkdir upstream for i in $(git ls-tree upstream/master --name-only); do - echo $i if [[ $i == *.md ]];then + echo $i git show upstream/master:$i > upstream/$i fi done @@ -22,7 +22,7 @@ fi git status -#git merge --no-ff --no-commit upstream/master +git merge --no-ff --no-commit upstream/master #concerns=('js/ide.js' 'js/map.ts') #for i in $(git diff --name-only --diff-filter=U --relative);do # echo "$i"