2020-12-03 18:29:40 +01:00
|
|
|
# vi:syntax=gitconfig
|
2022-08-12 15:46:51 +02:00
|
|
|
#[core] # DEPRECATED: excludesfile should be in ~/.config/git/ignore
|
|
|
|
|
#excludesfile = ~/.gitignore
|
2020-11-22 16:58:46 +01:00
|
|
|
|
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
|
2023-09-15 10:23:01 +02:00
|
|
|
|
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]
|
|
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
|
showtool = "!showci () { rev=${1:-HEAD}; git difftool $rev~1 $rev; }; showci $1"
|
2021-10-09 12:28:10 +02:00
|
|
|
mylog = "log --pretty='format:👉 %C(yellow)commit: %h%C(auto)%d %Creset%nAuthor: %C(auto,cyan)%>(12)%an (%aE)%n%C(reset)Date: %C(auto,green)%ar%Creset%nContent: %s'"
|
2023-10-25 11:43:16 +02:00
|
|
|
flog = "!flog() { git log --oneline $@ | fzf --multi --preview 'git -p show --color=always {+1}' --preview-window=right,60% | awk '{print $1}'; }; flog"
|
