Change git difftool to prompt, actually install .gitconfig

This commit is contained in:
2016-05-04 23:51:17 -04:00
parent e735c56069
commit 6492f83607
2 changed files with 2 additions and 1 deletions

View File

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

View File

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