Commit aa2c42d9 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] branchsync: don't update EXCLUDED

parent 7105104b
......@@ -104,6 +104,10 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
# cherry-pick was clean
# restore the copyrights and api files
git checkout HEAD -- util/copyrights lib/*/api
# don't update the EXCLUDED file
if [ -n `git ls-files EXCLUDED` ]; then
git checkout HEAD -- EXCLUDED
# note which hash we've merged
savehash branchsync.dat $SOURCEBRANCH $hash
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment