summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorCarlo Sala <carlosalag@protonmail.com>2021-10-06 10:13:38 +0200
committerGitHub <noreply@github.com>2021-10-06 10:13:38 +0200
commitbf7c1b160d164f080a276e6ed6b21ef8008079ee (patch)
treeb34b0a3f41e9582ed408ca29290f9d58522a136b /plugins
parent63b7e5767d551b1d839888a7216f2bed01e8eb1f (diff)
downloadzsh-bf7c1b160d164f080a276e6ed6b21ef8008079ee.tar.gz
zsh-bf7c1b160d164f080a276e6ed6b21ef8008079ee.tar.bz2
zsh-bf7c1b160d164f080a276e6ed6b21ef8008079ee.zip
fix(git)!: rename `gdu` alias to `gdup` (#10263)
BREAKING CHANGE: the `gdu` alias has been renamed to `gdup` to avoid a conflict with `go disk usage` (https://github.com/dundee/gdu).
Diffstat (limited to 'plugins')
-rw-r--r--plugins/git/README.md2
-rw-r--r--plugins/git/git.plugin.zsh2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md
index b68dc552e..12e3676e8 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -67,7 +67,7 @@ plugins=(... git)
| gds | git diff --staged |
| gdt | git diff-tree --no-commit-id --name-only -r |
| gdnolock | git diff $@ ":(exclude)package-lock.json" ":(exclude)&ast;.lock" |
-| gdu | git diff @{u} |
+| gdup | git diff @{upstream} |
| gdv | git diff -w $@ \| view - |
| gdw | git diff --word-diff |
| gf | git fetch |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index f2431fde5..5c5db9972 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -126,7 +126,7 @@ alias gdcw='git diff --cached --word-diff'
alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
alias gds='git diff --staged'
alias gdt='git diff-tree --no-commit-id --name-only -r'
-alias gdu='git diff @{u}'
+alias gdup='git diff @{upstream}'
alias gdw='git diff --word-diff'
function gdnolock() {