Skip to content

Commit

Permalink
Make delete-local-merged and pbcopy/paste to work in OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
nberger committed Apr 7, 2017
1 parent 48cfe12 commit 2c31b74
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
9 changes: 8 additions & 1 deletion bin/git-delete-local-merged
Expand Up @@ -5,4 +5,11 @@
#
# https://plus.google.com/115587336092124934674/posts/dXsagsvLakJ

git branch --merged | grep -v '^*' | grep -v 'master' | grep -v '^staging' | tr -d '\n' | xargs -r git branch -d
if [[ `uname` == 'Darwin' ]]
then
git branch --merged | grep -v '^*' | grep -v 'master' | grep -v '^staging' | \
xargs git branch -d
else
git branch --merged | grep -v '^*' | grep -v 'master' | grep -v '^staging' | \
xargs -r git branch -d
fi
9 changes: 7 additions & 2 deletions clipboard/aliases.zsh
@@ -1,2 +1,7 @@
alias pbcopy='xclip -selection clipboard'
alias pbpaste='xclip -selection clipboard -o'
if [[ `uname` == 'Darwin' ]]
then
# nothing to do, pbcopy and pbpaste just work
else
alias pbcopy='xclip -selection clipboard'
alias pbpaste='xclip -selection clipboard -o'
fi

0 comments on commit 2c31b74

Please sign in to comment.