commit 002d6ccc258de720b70c40edb12fbafb741eb1be
parent 9cc722298b227ef9e615a5ce6b8fe0cc76ed6f5c
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Fri, 22 Nov 2013 11:13:59 +0100
Added git aliases, removed showcmd option
Diffstat:
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.vimrc b/.vimrc
@@ -51,7 +51,8 @@ Bundle 'mileszs/ack.vim'
filetype plugin indent on
-set t_Co=16 " for solarized theme
+" terminal colors
+set t_Co=16
" Enable syntax highligting
syntax on
@@ -83,7 +84,7 @@ set pastetoggle=<F2> " toggle paste mode
set ruler " Enable bottom ruler
set scrolloff=3 " show context above-below cursorline
set shiftwidth=4 " width for autoindents
-set showcmd
+"set showcmd
set smartcase " case-sensitive search if any caps
set softtabstop=4 " makes the tab key indent by four spaces
set tabstop=8 " a tab is 4 characters wide
diff --git a/.zshrc b/.zshrc
@@ -74,6 +74,9 @@ alias ll='ls -lha'
alias m='make'
alias mc='make clean'
alias zshreload='source ~/.zshrc'
+alias gs='git status'
+alias gcgp='git commit && git push'
+alias gcagp='git commit -a && git push'
# mark functionality
export MARKPATH=$HOME/.marks