From eec2812dad4ff33dcecca25e4509f8b12d960d58 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 16 Oct 2022 14:55:11 -0700 Subject: git-dotfiles-update-master: improve message --- bin/git-dotfiles-update-master | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/git-dotfiles-update-master') 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 -- cgit v1.2.3