From d9db1749c7601e29b261384115dbda0f4751de76 Mon Sep 17 00:00:00 2001 From: Yaniv Mordekhay Date: Fri, 18 Oct 2024 08:32:47 +0300 Subject: [PATCH] feat(git): add `gpff` alias --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index bcadc4713..bf4756e9e 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -121,6 +121,7 @@ plugins=(... git) | `gmtl` | `git mergetool --no-prompt` | | `gmtlvim` | `git mergetool --no-prompt --tool=vimdiff` | | `gl` | `git pull` | +| `gpff` | `git pull --ff-only` | | `gpr` | `git pull --rebase` | | `gprv` | `git pull --rebase -v` | | `gpra` | `git pull --rebase --autostash` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index f34c0726b..7c80dd130 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -263,6 +263,7 @@ alias gmtl='git mergetool --no-prompt' alias gmtlvim='git mergetool --no-prompt --tool=vimdiff' alias gl='git pull' +alias gpff='git pull --ff-only' alias gpr='git pull --rebase' alias gprv='git pull --rebase -v' alias gpra='git pull --rebase --autostash'