diff --git a/.gitconfig b/.gitconfig index b7ceabc..0269ea2 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,6 +4,6 @@ [diff] tool = vimdiff [difftool] - prompt = false + prompt = true [push] default = simple diff --git a/install.sh b/install.sh index f2525d9..22b892b 100755 --- a/install.sh +++ b/install.sh @@ -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;