mirror of
https://github.com/cupcakearmy/dotfiles.git
synced 2024-12-22 16:26:32 +00:00
vim & gitconfig
This commit is contained in:
parent
8c385e23a8
commit
1d5c33b85b
@ -7,13 +7,7 @@
|
|||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
required = true
|
required = true
|
||||||
[core]
|
[core]
|
||||||
excludesfile = /Users/nicco/.gitignore_global
|
excludesfile = $HOME/.gitignore_global
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
[difftool "sourcetree"]
|
|
||||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
||||||
path =
|
|
||||||
[mergetool "sourcetree"]
|
|
||||||
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
||||||
trustExitCode = true
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
@ -1,7 +1,15 @@
|
|||||||
- clean: ['~']
|
- defaults:
|
||||||
|
link:
|
||||||
|
create: true
|
||||||
|
relink: true
|
||||||
|
force: true
|
||||||
|
|
||||||
|
- clean: ["~"]
|
||||||
|
|
||||||
- link:
|
- link:
|
||||||
~/.gitconfig: gitconfig
|
~/.gitconfig: gitconfig
|
||||||
|
~/.vim: vim
|
||||||
~/.vimrc: vimrc
|
~/.vimrc: vimrc
|
||||||
|
|
||||||
|
- shell:
|
||||||
|
- [git submodule update --init --recursive, Installing submodules]
|
||||||
|
1
vim/.gitignore
vendored
Normal file
1
vim/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
undodir
|
2687
vim/autoload/plug.vim
Normal file
2687
vim/autoload/plug.vim
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user