From 689f7e524a66621839bfb20e7b3026a76b11c084 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 19 Nov 2014 17:43:34 -0800
Subject: [PATCH] Bump emacs.d tweak clean-branches git alias.

---
 dotfiles/emacs.d   | 2 +-
 dotfiles/gitconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index bdd1bd0e..05b3bc82 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit bdd1bd0e3bc2f989e268147e0569540028d2ba34
+Subproject commit 05b3bc8255770dd10aa6c513b2b2ebb8689b0096
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index fec8f8c9..97f8bdaa 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -44,7 +44,7 @@
 	reb = "!r() { git rebase -i HEAD~$1; }; r"
 	# Diff a file or show it in git's pager if it is untracked
 	du = "!d() { git ls-files $1 --error-unmatch 2>/dev/null 1>/dev/null && git diff $1 || `git config --get core.pager` $1; }; d"
-	clean-branches = "!r() { git branch -r --merged ${1-origin/master} | xargs -n1 git branch -d; }; r"
+	clean-branches = "!r() { git branch --merged ${1-origin/master} | grep -v '*' | xargs -n1 git branch -d; }; r"
         diff-excluding = "!f() { exclude=$1; shift; git diff $1 $2 --name-only | grep -v $exclude | xargs git diff "$@" --; }; f"
         aliases = "!f() { git config --get-regexp ^alias | cut -c 7-; }; f"
         file-exists = "!f() { git ls-files $1 --error-unmatch > /dev/null 2> /dev/null; }; f"