1
0
mirror of https://git.decapod.one/brethil/dotfiles synced 2024-12-24 16:21:30 +01:00

add gitconfig, update install script

This commit is contained in:
bretello 2020-11-22 16:58:46 +01:00
parent a0db0e71e7
commit 653ad00615
2 changed files with 21 additions and 9 deletions

20
gitconfig Normal file
View File

@ -0,0 +1,20 @@
[core]
excludesfile = ~/.gitignore
[pull]
ff = only
rebase = true
[merge]
ff = only
tool = vimdiff2
[diff]
tool = vimdiff2
[rebase]
autostash = true
autosquash = true
[log]
abbrevcommit = true

View File

@ -21,15 +21,7 @@ PACKAGES="vim zsh antibody git grc ccze bmon mtr tmux byobu htop baantibody path
function setup_git {
# set up some git stuff
git config --global pull.ff only
git config --global merge.ff only
git config --global merge.tool vimdiff
git config --global rebase.autosquash true
git config --global rebase.autostash true
git config --global log.abbrevcommit yes
git config --global include.path $DOTFILES/gitconfig
}
function install_vimrc {