diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-10-16 14:55:11 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-10-18 12:40:47 -0700 |
| commit | eec2812dad4ff33dcecca25e4509f8b12d960d58 (patch) | |
| tree | cf3a473a07d91055d7ef623a28c3d59a523287ce /bin/git-dotfiles-update-master | |
| parent | 589b32ae19046cefa8aa4cb872a777fdea11e2c0 (diff) | |
| download | dotfiles-eec2812dad4ff33dcecca25e4509f8b12d960d58.tar.gz | |
git-dotfiles-update-master: improve message
Diffstat (limited to 'bin/git-dotfiles-update-master')
| -rwxr-xr-x | bin/git-dotfiles-update-master | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/git-dotfiles-update-master b/bin/git-dotfiles-update-master index 594ba803..201c4731 100755 --- a/bin/git-dotfiles-update-master +++ b/bin/git-dotfiles-update-master @@ -34,8 +34,8 @@ if git verify-commit-by-fp \ # attacker causing us to check out an older signed commit than the # one we have now if ! git merge-ff master origin/master; then - echo >&2 "uh oh, dotfiles remote head is not fast-forward of master" - echo >&2 "refusing to rebase; manually apply local commits to origin/master" + echo >&2 "dotfiles remote head signed by Sean, but not fast-forward of master" + echo >&2 "will not auto-rebase; manually rebase/reset master on/to origin/master" exit 1 fi else |