diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-11 14:06:07 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-11 14:06:07 -0700 |
| commit | 482e8a654063a9386987611dede2b982169b3c34 (patch) | |
| tree | 09aabd8e238d6f236c00fdb00176331698ac46d7 /bin/git-dotfiles-update-master | |
| parent | 5820262915a1c183f591be12360b031dc44b94a3 (diff) | |
| download | dotfiles-482e8a654063a9386987611dede2b982169b3c34.tar.gz | |
various explanatory comments
Diffstat (limited to 'bin/git-dotfiles-update-master')
| -rwxr-xr-x | bin/git-dotfiles-update-master | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/git-dotfiles-update-master b/bin/git-dotfiles-update-master index 52f848af..fa67f290 100755 --- a/bin/git-dotfiles-update-master +++ b/bin/git-dotfiles-update-master @@ -4,6 +4,10 @@ set -e . $HOME/.shenv +# TODO generalise to a script that reads a git config value for the +# fingerprint to look for, updates branches specified by user and is +# able to handle updating by both merge and rebase + git fetch origin if git verify-commit --raw origin/master 2>&1 \ | grep "VALIDSIG .* 8DC2487E51ABDD90B5C4753F0F56D0553B6D411B"; then |