07a4a6c update.py: Add a --rebase-branch option

Authored and Committed by otaylor 3 years ago
    update.py: Add a --rebase-branch option
    
    Rebasing something other than the current branch is especially convenient
    when making changes to the tooling scripts. Add a --rebase-branch option
    to ./update.py --rebase. Use this to make './update.py --merge' use the
    rebase script from the main branch, not from the PR.
    
        
file modified
+1 -2
file modified
+27 -17
file modified
+12 -3