new global gitignore and expanded tabs in gitconfig. some vim tweaks
parent
56dfd20a95
commit
e76c43f75e
36
.gitconfig
36
.gitconfig
|
|
@ -64,24 +64,24 @@
|
|||
# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
|
||||
# instead of a/b/c/d as prefixes for patches
|
||||
mnemonicprefix = true
|
||||
guitool=p4diff
|
||||
tool=p4diff
|
||||
guitool=p4diff
|
||||
tool=p4diff
|
||||
|
||||
[difftool "p4diff"]
|
||||
cmd=p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote $BASE $LOCAL $REMOTE
|
||||
cmd=p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote $BASE $LOCAL $REMOTE
|
||||
|
||||
[merge]
|
||||
tool = p4merge
|
||||
tool = p4merge
|
||||
|
||||
[mergetool "p4merge"]
|
||||
cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
|
||||
cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
|
||||
keepTemporaries = false
|
||||
trustExitCode = false
|
||||
keepBackup = false
|
||||
|
||||
[mergetool]
|
||||
prompt = false
|
||||
trustExitCode = false
|
||||
prompt = false
|
||||
trustExitCode = false
|
||||
|
||||
[advice]
|
||||
statusHints = false
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
[core]
|
||||
# Use custom `.gitignore` and `.gitattributes`
|
||||
excludesfile = /Users/Adam/.global_ignore
|
||||
excludesfile = /Users/Adam/.gitignore
|
||||
attributesfile = ~/.gitattributes
|
||||
# Treat spaces before tabs and all kinds of trailing whitespace as an error.
|
||||
# [default] trailing-space: looks for spaces at the end of a line
|
||||
|
|
@ -105,9 +105,9 @@
|
|||
# Make `git rebase` safer on OS X
|
||||
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
|
||||
trustctime = false
|
||||
autocrlf = false
|
||||
autocrlf = false
|
||||
eol = 'lf'
|
||||
editor = $EDITOR
|
||||
editor = $EDITOR
|
||||
|
||||
[color]
|
||||
# Use colors in Git commands that are capable of colored output when
|
||||
|
|
@ -151,19 +151,17 @@
|
|||
insteadOf = "gist:"
|
||||
|
||||
[push]
|
||||
default = current
|
||||
default = current
|
||||
[pull]
|
||||
default = current
|
||||
default = current
|
||||
[user]
|
||||
email = adamveld12@gmail.com
|
||||
name = Adam Veldhousen
|
||||
signingkey = 415C0B9C
|
||||
email = adamveld12@gmail.com
|
||||
name = Adam Veldhousen
|
||||
signingkey = 415C0B9C
|
||||
[commit]
|
||||
gpgsign = true
|
||||
gpgsign = true
|
||||
|
||||
[help]
|
||||
autocorrect=20
|
||||
[credential]
|
||||
helper = osxkeychain
|
||||
[http]
|
||||
sslVerify = false
|
||||
helper = osxkeychain
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
.bashrc
|
||||
.rnd
|
||||
*.kdbx
|
||||
_*
|
||||
.vim_colorv_cache
|
||||
.NERDTreeBookmarks
|
||||
*.log
|
||||
|
|
@ -66,3 +65,40 @@ Applications/
|
|||
.chefdk/
|
||||
projects/
|
||||
.keybase-installer/
|
||||
|
||||
# Compiled source #
|
||||
###################
|
||||
*.com
|
||||
*.class
|
||||
*.dll
|
||||
*.exe
|
||||
*.o
|
||||
*.so
|
||||
|
||||
# Packages #
|
||||
############
|
||||
# it's better to unpack these files and commit the raw source
|
||||
# git has its own built in compression methods
|
||||
*.7z
|
||||
*.dmg
|
||||
*.gz
|
||||
*.iso
|
||||
*.jar
|
||||
*.rar
|
||||
*.tar
|
||||
*.zip
|
||||
|
||||
# Logs and databases #
|
||||
######################
|
||||
*.log
|
||||
*.sql
|
||||
*.sqlite
|
||||
|
||||
# OS generated files #
|
||||
######################
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
|
|
|
|||
7
.vimrc
7
.vimrc
|
|
@ -119,7 +119,7 @@ map <F1> <Nop>
|
|||
noremap <leader>W :w !sudo tee % > /dev/null<CR>
|
||||
|
||||
" generate tags
|
||||
nnoremap <leader>t ctags -R -f ./.git/tags .
|
||||
nnoremap <leader>c ctags -R -f ./.git/tags .
|
||||
|
||||
" enable neocomplete
|
||||
let g:neocomplete#enable_at_startup = 0
|
||||
|
|
@ -195,6 +195,11 @@ set showcmd
|
|||
" Start scrolling x lines before the horizontal window border
|
||||
set scrolloff=4
|
||||
|
||||
" tern
|
||||
let g:tern_show_argument_hits='on_hold'
|
||||
let g:tern_map_keys=1
|
||||
let g:tern_map_prefix = '<leader>'
|
||||
|
||||
" vim-go
|
||||
let g:go_highlight_functions = 1
|
||||
let g:go_highlight_methods = 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue