Bump emacs.d tweak clean-branches git alias.

This commit is contained in:
Ivan Malison 2014-11-19 17:43:34 -08:00
parent ab8f081be2
commit 689f7e524a
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit bdd1bd0e3bc2f989e268147e0569540028d2ba34 Subproject commit 05b3bc8255770dd10aa6c513b2b2ebb8689b0096

View File

@ -44,7 +44,7 @@
reb = "!r() { git rebase -i HEAD~$1; }; r" reb = "!r() { git rebase -i HEAD~$1; }; r"
# Diff a file or show it in git's pager if it is untracked # 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" 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" 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" 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" file-exists = "!f() { git ls-files $1 --error-unmatch > /dev/null 2> /dev/null; }; f"