Permalink
Browse files

more and more

  • Loading branch information...
1 parent 6c2334d commit 3234620f659ea988bd2c80a0bc77eea053fc6498 Matthew M. Robinson committed Sep 23, 2009
Showing with 26 additions and 16 deletions.
  1. +16 −13 .bash_aliases
  2. +2 −0 .inputrc
  3. +2 −1 .screenrc
  4. +3 −0 .vimrc
  5. +2 −2 .vimrc_files/show_diff.vim
  6. +1 −0 create_symlinks
View
@@ -1,26 +1,29 @@
#alias sqlplus='env -u NLS_LANG sqlplus'
-alias ls="ls -FC --color"
-alias lt="ls -ltr"
-alias ll="ls -la"
-alias rm="rm -i"
-alias splitmp3="mp3splt -a -t 5.0 -d split_files -o @n_@f"
-alias ack="ack-grep --ignore-dir data --ignore-dir images"
+alias ls='ls -FC --color'
+alias lt='ls -ltr'
+alias ll='ls -al'
+alias rm='rm -i'
+alias splitmp3='mp3splt -a -t 5.0 -d split_files -o @n_@f'
+alias ack='ack-grep --ignore-dir data --ignore-dir images'
# Version Control
-alias sdl="if [ -d .svn ]; then svn_diff_less; else git diff trunk --no-prefix | diff_painter.pl | less -R; fi"
-alias sst="if [ -d .svn ]; then svn status; else git diff trunk --name-status; fi"
-alias gdl="git diff";
-alias gst="git status";
+alias sdl='if [ -d .svn ]; then svn_diff_less; else git diff trunk --no-prefix | diff_painter.pl | less -R; fi'
+alias sst='if [ -d .svn ]; then svn status; else git diff trunk --name-status; fi'
+alias gdl='git diff --no-prefix HEAD~ | diff_painter.pl | less -R'
+alias gst='git status'
+alias gsr='git svn rebase'
+alias viall='vi `sst | perl -pne "s/^\S\s+//"`';
+
# Git
-alias gco="git checkout"
+alias gco='git checkout'
# Show most used commands that might be good candidates for aliases
alias mu='history | cut -d " " -f3 | sort | uniq -c | sort -nr | head -50'
# Compress the cd, ls -l series of commands.
-alias lc="cl"
+alias lc='cl'
function cl () {
if [ $# = 0 ]; then
cd && ll
@@ -29,7 +32,7 @@ function cl () {
fi
}
# Rentrak specific
-alias edev2="ssh -t edev2 screen -R"
+alias edev2='ssh -t edev2 screen -R'
alias db='rlwrap --remember --histsize 10000 rtk_database_login.pl -x'
alias dbl='rtk_database_login.pl --list'
alias buall='/home/msw/bin/bu `slnu`'
View
@@ -0,0 +1,2 @@
+set show-all-if-unmodified on
+"\M-[3~": delete-char
View
@@ -1,5 +1,6 @@
startup_message off
escape ^Ll # Don't like ctrl-a so now it's ctrl-l
termcapinfo xterm|xterms|xs|rxvt ti@:te@ # Give mouse scrolling
-caption always "%{= kw}%-w%{= BW}%n %t%{-}%+w %-= %1` %m/%d/%y %C:%s%a"
+#caption always "%{= kw}%-w%{= BW}%n %t%{-}%+w %-= %1` %m/%d/%y %C:%s%a"
+caption always "%{= kw}%-w%{= BW}%n %t%{-}%+w %-= %1` %m/%d/%y %C:%a"
defscrollback 5000
View
3 .vimrc
@@ -91,3 +91,6 @@ endif
" Use ack instead of grep
" set grepprg=ack\ -a\ --nobinary\ --sort-files\ --ignore-dir=data\ --ignore-dir=images\ --color
+
+" remove space next to enclosing parens
+map ,dw :%s/( \(.\{-}\) )/(\1)/g<cr>
@@ -1,8 +1,8 @@
map ,sd :w!<CR>:! if [ -d .svn ]; then svn diff %; else git diff trunk --no-prefix %; fi \| diff_painter.pl \| less -R<CR>
map! ,sd <ESC>:w!<CR>:! if [ -d .svn ]; then svn diff %; else git diff trunk --no-prefix %; fi \| diff_painter.pl \| less -R<CR>
-map ,gdh :w!<CR>:! git diff trunk % \| diff_painter.pl \| less -R<CR>
-map! ,gdh <ESC>:w!<CR>:! git diff trunk % \| diff_painter.pl \| less -R<CR>
+map ,gd :w!<CR>:! git diff HEAD % \| diff_painter.pl \| less -R<CR>
+map! ,gd <ESC>:w!<CR>:! git diff HEAD % \| diff_painter.pl \| less -R<CR>
" need to look up how you tell svn to use the real diff
"map ,sdf :w!<CR>:! svn diff -1000 % \| diff_painter.pl \| less -R<CR>
View
@@ -23,6 +23,7 @@ sub file_names
.bash_profile
.bashrc
.dir_colors
+ .inputrc
.screenrc
.vim
.vimrc

0 comments on commit 3234620

Please sign in to comment.