Obsolete Gr and Grr

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7351026a8f65531e6052a7d0f3d82b636cf7ec70..829cd01ff54f5ec909a70c470db3fbb75394d0d3 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -125,27 +125,28 @@ alias Gam="git commit --amend"
 
 alias Gl="git log --oneline --graph --decorate=short"
 alias Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'"
-alias Gr="git --no-pager log --oneline -n 20 | perl -ne 'print \"@~\$n \$_\"; \$n++'"
-alias Grr="git --no-pager log --oneline --graph -n 1024 | vi -c 'setlocal filetype=gitrebase buftype=nofile noswapfile' -"
 
 bindkey -s "\eOR" " git status --short\n" # F3
 # }}}
 
 # grep {{{
 GREP_ARGS=(
-    --color=always
+    --colour=always
     --with-filename
     --line-number
     --dereference-recursive
+    --binary-files=without-match
+    --exclude-dir=.git
+    --exclude-dir=.tags
 )
-LESS_COLORED=(less --RAW-CONTROL-CHARS)
+LESS_COLOURED=(less --RAW-CONTROL-CHARS)
 g() {
-    grep $GREP_ARGS $@ | $LESS_COLORED
+    grep $GREP_ARGS $@ | $LESS_COLOURED
 }
 GS() {
-    grep $GREP_ARGS $@ | sort --numeric-sort | $LESS_COLORED
+    grep $GREP_ARGS $@ | sort --numeric-sort | $LESS_COLOURED
 }
-alias -g G="| grep --color=always"
+alias -g G="| grep --colour=always"
 alias gg="git grep "
 # }}}
 
@@ -212,7 +213,7 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
 # fzf {{{
 export FZF_DEFAULT_OPTS="--color=16 --info=inline"
 cf() {
-    local dir=$(find ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
+    local dir=$(find -L ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
         fzf --height 40% --reverse --preview="tree -CN {}")
     [[ -z $dir ]] || cd $dir
 }