2020-12-03 18:29:40 +01:00
|
|
|
# vi:syntax=gitconfig
|
2020-11-22 16:58:46 +01:00
|
|
|
[core]
|
|
|
|
|
excludesfile = ~/.gitignore
|
|
|
|
|
|
2020-12-03 18:29:40 +01:00
|
|
|
#[init]
|
|
|
|
|
# templatedir = ~/.git_template
|
|
|
|
|
|
2020-11-22 16:58:46 +01:00
|
|
|
[pull]
|
|
|
|
|
ff = only
|
|
|
|
|
rebase = true
|
|
|
|
|
|
|
|
|
|
[merge]
|
|
|
|
|
ff = only
|
2021-03-15 10:29:37 +01:00
|
|
|
tool = vimdiff
|
2020-11-22 16:58:46 +01:00
|
|
|
|
2020-12-03 18:29:40 +01:00
|
|
|
[mergetool]
|
|
|
|
|
keepBackup = false
|
|
|
|
|
|
2020-11-22 16:58:46 +01:00
|
|
|
[diff]
|
2021-03-15 10:29:37 +01:00
|
|
|
tool = vimdiff
|
2020-11-22 16:58:46 +01:00
|
|
|
|
2020-12-03 18:29:40 +01:00
|
|
|
[difftool]
|
|
|
|
|
prompt=true
|
2020-11-22 16:58:46 +01:00
|
|
|
[rebase]
|
|
|
|
|
autostash = true
|
|
|
|
|
autosquash = true
|
2020-12-03 18:29:40 +01:00
|
|
|
squash = true
|
2020-11-22 16:58:46 +01:00
|
|
|
|
|
|
|
|
[log]
|
|
|
|
|
abbrevcommit = true
|
2020-12-03 18:29:40 +01:00
|
|
|
|
|
|
|
|
[format]
|
|
|
|
|
#pretty = format:%C(yellow)commit %h%Cred%d %Creset%nAuthor: %Cblue%>(12)%an%n%CgreenDate: %ar%Creset%n%n%B
|
|
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
|
showtool = "!showci () { rev=${1:-HEAD}; git difftool $rev~1 $rev; }; showci $1"
|
