diff options
Diffstat (limited to 'plugins/git/git.plugin.zsh')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 0a26399a2..99f640e88 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -297,10 +297,13 @@ function ggf() { } compdef _git ggf=git-checkout -alias gpf!='git push --force' +alias 'gpf!'='git push --force' is-at-least 2.30 "$git_version" \ - && alias gpf='git push --force-with-lease --force-if-includes' \ - || alias gpf='git push --force-with-lease' + && alias gpf='read -k 1 -q "?Continue force-push? [y/N] " && echo && git push --force-with-lease --force-if-includes' \ + || alias gpf='read -k 1 -q "?Continue force-push? [y/N] " && echo && git push --force-with-lease' +is-at-least 2.30 "$git_version" \ + && alias gpff='git push --force-with-lease --force-if-includes' \ + || alias gpff='git push --force-with-lease' function ggfl() { [[ "$#" != 1 ]] && local b="$(git_current_branch)" |