|
@@ -266,7 +266,6 @@ if iscygwin; then |
|
|
null type windate || \ |
|
|
null type windate || \ |
|
|
alias windate="/c/Windows/System32/cmd.exe //c 'echo %DATE%-%TIME%'" |
|
|
alias windate="/c/Windows/System32/cmd.exe //c 'echo %DATE%-%TIME%'" |
|
|
alias cygsu="cygstart /cygwinsetup.exe" |
|
|
alias cygsu="cygstart /cygwinsetup.exe" |
|
|
alias emacs="CYGWIN=tty emacs -nw" |
|
|
|
|
|
alias ls="ls -CFG $(iswindows || test "$TERM" = dumb || echo --color=auto)" |
|
|
alias ls="ls -CFG $(iswindows || test "$TERM" = dumb || echo --color=auto)" |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
@@ -318,10 +317,10 @@ s(){ |
|
|
if git rev-parse --git-dir >/dev/null 2>&1 |
|
|
if git rev-parse --git-dir >/dev/null 2>&1 |
|
|
then |
|
|
then |
|
|
git grep -n "$@" |
|
|
git grep -n "$@" |
|
|
elif which ag >/dev/null |
|
|
|
|
|
|
|
|
elif which ag >/dev/null 2>&1 |
|
|
then |
|
|
then |
|
|
ag --pager="$PAGER" "$@" |
|
|
ag --pager="$PAGER" "$@" |
|
|
elif which ack >/dev/null |
|
|
|
|
|
|
|
|
elif which ack >/dev/null 2>&1 |
|
|
then |
|
|
then |
|
|
ack --pager="$PAGER" "$@" |
|
|
ack --pager="$PAGER" "$@" |
|
|
else |
|
|
else |
|
|