linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-22 04:51:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>

# Conflicts:
#	plugins/npm/npm.plugin.zsh
This commit is contained in:
Gaetan Semet 2017-11-28 23:17:14 +01:00
commit f5f4796902
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/git2/git2.plugin.zsh
View file

@ -59,6 +59,8 @@ compdef _git gPgPum=git-push
# git push dry run
alias gPd='git push --dry-run'
compdef _git gPd=git-push
# git push --tags
alias gPt='git push --tags'
# git push force
alias gPf='git push --force'
compdef _git gPf=git-push
@ -284,7 +286,7 @@ compdef _git gke='gitk'
# Clean
# Remove all .orig, .BASE.*, .REMOTE.*, .LOCAL.*, *.BACKUP files
alias gclean='find $(git rev-parse --show-toplevel) -name "*.orig" -or -name "*.REMOTE.*" -or -name "*.LOCAL.*" -or -name "*.BACKUP.*" -or -name "*.BASE.*" | xargs -r rm -v'
alias gclean='find $(git rev-parse --show-toplevel) -name "*.orig" -or -name "*_REMOTE_*" -or -name "*_LOCAL_*" -or -name "*_BACKUP_*" -or -name "*_BASE_*" | xargs -r rm -v'
alias gcleanreset='(cd $(git rev-parse --show-toplevel) && git reset --hard && git clean -dfx)'
# Edit global Git configuration files