diff --git a/bashrc b/bashrc index 0e62117..0273c67 100755 --- a/bashrc +++ b/bashrc @@ -284,6 +284,7 @@ then complete -o bashdefault -o default -o nospace -F _git g 2>/dev/null \ || complete -o default -o nospace -F _git g fi +git svn --help >/dev/null 2>&1 && alias gsvn="git svn" null type gitmemo && alias m=gitmemo null type gitmemo && alias m=gitmemo diff --git a/emacs.el b/emacs.el index 869e491..9b36a66 100644 --- a/emacs.el +++ b/emacs.el @@ -1828,7 +1828,7 @@ if arg given, use that eshell buffer, otherwise make new eshell buffer." (require 'grep) (compilation-start (if (eq 0 (shell-command "git rev-parse --git-dir")) - (format "git --no-pager grep -nH -e '%s'" + (format "git --no-pager -c color.grep=false grep -nH -e '%s'" word) (if (executable-find "ag") (format "ag --nocolor --nogroup --nopager '%s'"