rik/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating some stuff [lazy commit]

Browse Source
This commit is contained in:
Nick Nisi
2012-12-20 10:14:11 -06:00
parent 5cc67b2273
commit 2213b78583
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git/gitconfig.symlink
View File

@@ -18,6 +18,8 @@
gdc = diff --cached gdc = diff --cached
# show changed files for a commit # show changed files for a commit
cf = show --pretty="format:" --name-only cf = show --pretty="format:" --name-only
# undo a commit
undo = reset --soft
# stash shortcuts # stash shortcuts
sp = stash pop sp = stash pop
@@ -82,3 +84,5 @@
[core] [core]
excludesfile = ~/.gitignore_global excludesfile = ~/.gitignore_global
pager = less -FXRS -x2 pager = less -FXRS -x2
[rerere]
enabled = true

4
vim/vimrc.symlink
View File

@@ -68,7 +68,7 @@ set softtabstop=4
set ttyfast set ttyfast
" allow matching of if/end, etc. with % " allow matching of if/end, etc. with %
runtime macros/matchit.vim " runtime macros/matchit.vim
" highlight conflicts " highlight conflicts
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -191,7 +191,7 @@ set laststatus=2 " show the satus line all the time
" Additional, plugin-specific mappings are located under " Additional, plugin-specific mappings are located under
" the plugins section " the plugins section
" "
nnoremap K :q<cr> " nnoremap K :q<cr>
" remap esc and disable to force learning " remap esc and disable to force learning
inoremap jk <esc> inoremap jk <esc>