wilderjds
/
oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "feat(git)!: ask for confirmation in `gpf` alias (#10169)"

Browse Source 
This reverts commit c13795d4c4.
master
Marc Cornellà 2 years ago
parent b0204f7839
commit 2056aeeead
2 changed files with 6 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      plugins/git/README.md
  2. 9
      plugins/git/git.plugin.zsh

6
plugins/git/README.md
Unescape View File

@ -136,10 +136,8 @@ plugins=(... git)
| `gpd` | `git push --dry-run` | | `gpd` | `git push --dry-run` |
| `gpf!` | `git push --force` | | `gpf!` | `git push --force` |
| `ggf` | `git push --force origin $(current_branch)` | | `ggf` | `git push --force origin $(current_branch)` |
| `gpf` | On Git >= 2.30: after confirmation, `git push --force-with-lease --force-if-includes` | | `gpf` | On Git >= 2.30: `git push --force-with-lease --force-if-includes` |
| `gpf` | On Git < 2.30: after confirmation, `git push --force-with-lease` | | `gpf` | On Git < 2.30: `git push --force-with-lease` |
| `gpff` | On Git >= 2.30: `git push --force-with-lease --force-if-includes` |
| `gpff` | On Git < 2.30: `git push --force-with-lease` |
| `ggfl` | `git push --force-with-lease origin $(current_branch)` | | `ggfl` | `git push --force-with-lease origin $(current_branch)` |
| `gpsup` | `git push --set-upstream origin $(git_current_branch)` | | `gpsup` | `git push --set-upstream origin $(git_current_branch)` |
| `gpsupf` | On Git >= 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes` | | `gpsupf` | On Git >= 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes` |

9
plugins/git/git.plugin.zsh
Unescape View File

@ -300,13 +300,10 @@ function ggf() {
} }
compdef _git ggf=git-checkout compdef _git ggf=git-checkout
alias 'gpf!'='git push --force' alias gpf!='git push --force'
is-at-least 2.30 "$git_version" \ is-at-least 2.30 "$git_version" \
&& alias gpf='read -k 1 -q "?Continue force-push? [y/N] " && echo && git push --force-with-lease --force-if-includes' \ && alias gpf='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' || alias gpf='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() { function ggfl() {
[[ "$#" != 1 ]] && local b="$(git_current_branch)" [[ "$#" != 1 ]] && local b="$(git_current_branch)"

Write Preview
Loading…
Cancel
Save