Merge branch 'master' of ssh+git://barakmich.com/fs/home/barak into homedir
This commit is contained in:
commit
0a57532a16
2 changed files with 24 additions and 17 deletions
33
.gitconfig
33
.gitconfig
|
|
@ -1,25 +1,26 @@
|
||||||
[user]
|
[user]
|
||||||
name = Barak Michener
|
name = Barak Michener
|
||||||
email = me@barakmich.com
|
email = me@barakmich.com
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
st = status
|
st = status
|
||||||
stat = status
|
stat = status
|
||||||
ci = commit
|
ci = commit
|
||||||
co = checkout
|
co = checkout
|
||||||
w = whatchanged
|
w = whatchanged
|
||||||
stagediff = diff --staged
|
revert = checkout -f
|
||||||
sdiff = diff --staged
|
stagediff = diff --staged
|
||||||
graph = log –graph –oneline
|
sdiff = diff --staged
|
||||||
|
graph = log --graph --oneline
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
renamelimit = 0
|
renamelimit = 0
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
diff = auto
|
diff = auto
|
||||||
interactive = auto
|
interactive = auto
|
||||||
status = auto
|
status = auto
|
||||||
branch = auto
|
branch = auto
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
|
|
|
||||||
8
.vimrc
8
.vimrc
|
|
@ -73,6 +73,12 @@ let g:NERDChristmasTree = 1
|
||||||
let g:NERDChristmasTree = 1
|
let g:NERDChristmasTree = 1
|
||||||
let g:NERDTreeQuitOnOpen = 1
|
let g:NERDTreeQuitOnOpen = 1
|
||||||
let g:NERDTreeWinPos = "right"
|
let g:NERDTreeWinPos = "right"
|
||||||
|
|
||||||
|
" Tagbar plugin settings
|
||||||
|
let g:tagbar_width = 40
|
||||||
|
let g:tagbar_autofocus = 1
|
||||||
|
|
||||||
|
" Taglist plugin settings (deprecated)
|
||||||
let Tlist_GainFocus_On_ToggleOpen = 1
|
let Tlist_GainFocus_On_ToggleOpen = 1
|
||||||
let Tlist_Use_Right_Window = 1
|
let Tlist_Use_Right_Window = 1
|
||||||
let Tlist_Inc_Winwidth = 0
|
let Tlist_Inc_Winwidth = 0
|
||||||
|
|
@ -101,7 +107,7 @@ au BufEnter *.org call org#SetOrgFileType()
|
||||||
"nnoremap gn gt
|
"nnoremap gn gt
|
||||||
"nnoremap gp gT
|
"nnoremap gp gT
|
||||||
nmap gt :NERDTreeToggle<CR>
|
nmap gt :NERDTreeToggle<CR>
|
||||||
nmap gT :TlistToggle<CR>
|
nmap gb :TlistToggle<CR>
|
||||||
"nnoremap gx :Kwbd<CR>
|
"nnoremap gx :Kwbd<CR>
|
||||||
nnoremap gc :Kwbd<CR>
|
nnoremap gc :Kwbd<CR>
|
||||||
"nnoremap gc :bdelete<CR>
|
"nnoremap gc :bdelete<CR>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue