aaron/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change git difftool to prompt, actually install .gitconfig

Browse Source
This commit is contained in:
Aaron Gutierrez
2016-05-04 23:51:17 -04:00
parent e735c56069
commit 6492f83607
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitconfig
View File

@@ -4,6 +4,6 @@
[diff] [diff]
tool = vimdiff tool = vimdiff
[difftool] [difftool]
prompt = false prompt = true
[push] [push]
default = simple default = simple

1
install.sh
View File

@@ -4,3 +4,4 @@ git submodule sync;
git submodule update; git submodule update;
rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE --no-perms . ~; rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE --no-perms . ~;
cp ./.gitconfig ~/.gitconfig;