From 4681bc1a0a27ae7233816f8c86a050be4a3b1406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?= Date: Thu, 3 Aug 2017 02:16:06 +0800 Subject: [PATCH] Update: git.plugin.zsh --force => --force-with-lease. https://developer.atlassian.com/blog/2015/04/force-with-lease/ --- plugins/git/git.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 34942d38..f45d81ff 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -104,7 +104,7 @@ alias gga='git gui citool --amend' ggf() { [[ "$#" != 1 ]] && local b="$(git_current_branch)" - git push --force origin "${b:=$1}" + git push --force-with-lease origin "${b:=$1}" } compdef _git ggf=git-checkout