swytch/dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

feat: remove deprecated merge alias

Browse Source
This commit is contained in:
David 2020-09-12 19:15:06 +02:00
parent 27227d2610
commit 6ab07d237b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.config/aliasrc
View File

@ -10,7 +10,6 @@ alias bulkrename='\ls | $EDITOR - -c ":%s/.*/mv -i & &/g"'
alias backup='rsync -aAXv --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} /' alias backup='rsync -aAXv --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} /'
alias printenv='printenv | sort' alias printenv='printenv | sort'
alias gu='git fetch upstream && git merge upstream/master' alias gu='git fetch upstream && git merge upstream/master'
alias merge='dotfiles checkout master && dotfiles merge dev && dotfiles checkout x1c3 && dotfiles merge dev && dotfiles checkout dev'
alias unimatrix='unimatrix -a -f -c=cyan -s=95' alias unimatrix='unimatrix -a -f -c=cyan -s=95'
alias untar='tar -zxvf' alias untar='tar -zxvf'
alias @root='ssh root@217.69.7.192' alias @root='ssh root@217.69.7.192'