diff --git a/scripts/upstream_sync.sh b/scripts/upstream_sync.sh index 44036b97..611f6a45 100755 --- a/scripts/upstream_sync.sh +++ b/scripts/upstream_sync.sh @@ -9,6 +9,7 @@ git checkout -b the-sacrifice mkdir upstream for i in $(git ls-tree upstream/master --name-only); do + echo $i if [[ $i == *.md ]];then git show upstream/master:$i > upstream/$i fi @@ -19,6 +20,8 @@ if [ -n "$(git status --porcelain)" ]; then git commit -m 'Preserving upstream markdown & text files.' fi +git status + #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