Update make script to build gh-pages branch w/o rebase

TBR=@arv

(Half of this patch landed in 89407c5c62caccace33671df8db6bbaadddcbe83. Scripts commited to git to manipulate git branches... )