From aaf79d6c1b6bee89591228dfbf7dbfcf6792ade4 Mon Sep 17 00:00:00 2001 From: Aaron Biggs Date: Tue, 13 Sep 2016 08:11:33 -0500 Subject: [PATCH] Add find and remove conflicted Dropbox files alias --- lib/aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 77b83a13a..10e75012f 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -44,8 +44,11 @@ alias code='~/Dropbox/Code' alias tunnel='sshuttle -D --pidfile=/tmp/sshuttle.pid -r abiggs@10.26.0.80 10.26.196.0/24' alias stoptunnel='[[ -f /tmp/sshuttle.pid ]] && kill `cat /tmp/sshuttle.pid`' +# Dropbox alias dw='~/Dropbox' alias dp='~/Dropbox\ \(Personal\)' +alias dpfc='find . -type f -name "* conflicted *"' +alias dprc='find . -type f -name "* conflicted *" -exec rm -f {} \;' # Docker Machine alias dminit="docker-machine create --driver virtualbox default"