diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-11 14:08:50 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-11 14:08:54 -0700 |
| commit | acf1412e1f79464374f3fc69edc7abd50737852d (patch) | |
| tree | c458b6af1c806a40902e7f3397c259890087f970 /bin/git-dotfiles-update-master | |
| parent | 482e8a654063a9386987611dede2b982169b3c34 (diff) | |
| download | dotfiles-acf1412e1f79464374f3fc69edc7abd50737852d.tar.gz | |
comment
Diffstat (limited to 'bin/git-dotfiles-update-master')
| -rwxr-xr-x | bin/git-dotfiles-update-master | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/git-dotfiles-update-master b/bin/git-dotfiles-update-master index fa67f290..bcf1d3d8 100755 --- a/bin/git-dotfiles-update-master +++ b/bin/git-dotfiles-update-master @@ -8,6 +8,12 @@ set -e # fingerprint to look for, updates branches specified by user and is # able to handle updating by both merge and rebase +# Before running this script, will want to unset all upstreams: +# for head in $(git for-each-ref --format='%(refname)' refs/heads/); do +# branch=$(echo "$head" | cut -d/ -f3) +# git branch --unset-upstream "$branch" 2>/dev/null || true +# done + git fetch origin if git verify-commit --raw origin/master 2>&1 \ | grep "VALIDSIG .* 8DC2487E51ABDD90B5C4753F0F56D0553B6D411B"; then |