39525e5ec36052a83fadd47f377a26d33df851bd
- Author
- Taehyun Hwang <eeht1717@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
feat(git): add `gpsupf` alias (#11268)
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index d455e0eff8d1800f3b8668bac7527d6e10f8d967..d5eaaa53f15e2b835b6f0057a08104f30f93a8ca 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -89,6 +89,7 @@ plugins=(... git)
6 | ggsup | git branch --set-upstream-to=origin/$(git_current_branch) |
7 | ggu | git pull --rebase origin $(current_branch) |
8 | gpsup | git push --set-upstream origin $(git_current_branch) |
9+| gpsupf | git push --set-upstream origin $(git_current_branch) --force-with-lease |
10 | ghh | git help |
11 | gignore | git update-index --assume-unchanged |
12 | gignored | git ls-files -v \| grep "^[[:lower:]]" |
13diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
14index 7544ca4402f518a5a1a500a852a6b7b555c5f03b..fc2c08ccda7b5da43de86777787eb86980d8f0bc 100644
15--- a/plugins/git/git.plugin.zsh
16+++ b/plugins/git/git.plugin.zsh
17@@ -199,6 +199,7 @@ alias ggpush='git push origin "$(git_current_branch)"'
18
19 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
20 alias gpsup='git push --set-upstream origin $(git_current_branch)'
21+alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease'
22
23 alias ghh='git help'
24
25@@ -341,4 +342,4 @@ function grename() {
26 fi
27 }
28
29-unset git_version
30+unset git_version