linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-07-03 05:31:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added alias for getting files with merge conflicts

Browse source
This commit is contained in:
Mike Francis 2016-04-20 10:43:53 +01:00
commit 562eed6a39
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,6 +82,7 @@ alias gdt='git diff-tree --no-commit-id --name-only -r'
gdv() { git diff -w "$@" | view - } gdv() { git diff -w "$@" | view - }
compdef _git gdv=git-diff compdef _git gdv=git-diff
alias gdw='git diff --word-diff' alias gdw='git diff --word-diff'
alias gdmc='git diff --name-only --diff-filter=U'
alias gf='git fetch' alias gf='git fetch'
alias gfa='git fetch --all --prune' alias gfa='git fetch --all --prune'