mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-17 23:57:52 +08:00
Code Issues Releases Wiki Activity

feat(git): add gpff alias

Browse Source
This commit is contained in:
Yaniv Mordekhay 2024-10-18 08:32:47 +03:00
parent 067558da92
commit d9db1749c7
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/git/README.md
View File

@ -121,6 +121,7 @@ plugins=(... git)
| `gmtl` | `git mergetool --no-prompt` | | `gmtl` | `git mergetool --no-prompt` |
| `gmtlvim` | `git mergetool --no-prompt --tool=vimdiff` | | `gmtlvim` | `git mergetool --no-prompt --tool=vimdiff` |
| `gl` | `git pull` | | `gl` | `git pull` |
| `gpff` | `git pull --ff-only` |
| `gpr` | `git pull --rebase` | | `gpr` | `git pull --rebase` |
| `gprv` | `git pull --rebase -v` | | `gprv` | `git pull --rebase -v` |
| `gpra` | `git pull --rebase --autostash` | | `gpra` | `git pull --rebase --autostash` |

1
plugins/git/git.plugin.zsh
View File

@ -263,6 +263,7 @@ alias gmtl='git mergetool --no-prompt'
alias gmtlvim='git mergetool --no-prompt --tool=vimdiff' alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
alias gl='git pull' alias gl='git pull'
alias gpff='git pull --ff-only'
alias gpr='git pull --rebase' alias gpr='git pull --rebase'
alias gprv='git pull --rebase -v' alias gprv='git pull --rebase -v'
alias gpra='git pull --rebase --autostash' alias gpra='git pull --rebase --autostash'