2021-08-09 22:14:44 +02:00
|
|
|
[user]
|
2023-12-01 16:08:01 +01:00
|
|
|
email = gabevenberg@gmail.com
|
2023-02-16 21:16:32 +01:00
|
|
|
name = Gabe Venberg
|
2021-08-09 22:14:44 +02:00
|
|
|
[alias]
|
|
|
|
|
hist = log --graph --date-order --date=short --pretty=format:'%C(auto)%h%d %C(reset)%s %C(bold blue)%ce %C(reset)%C(green)%cr (%cd)'
|
2023-06-07 17:57:43 +02:00
|
|
|
graph = log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'
|
2024-02-20 18:44:09 +01:00
|
|
|
recent = branch --sort=-committerdate --format='%(committerdate:relative)%09%(refname:short)'
|
2022-02-07 20:35:51 +01:00
|
|
|
[init]
|
2023-12-01 16:08:01 +01:00
|
|
|
defaultBranch = main
|
2023-02-16 11:46:17 +01:00
|
|
|
[push]
|
|
|
|
|
autoSetupRemote = true
|
2024-02-20 18:44:09 +01:00
|
|
|
default = current
|
2023-06-14 23:50:14 +02:00
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[diff]
|
2024-02-20 18:44:09 +01:00
|
|
|
; tool = nvimdiff
|
|
|
|
|
tool = difftastic
|
|
|
|
|
algorithm = histogram
|
|
|
|
|
submodule = log
|
2023-06-14 23:50:14 +02:00
|
|
|
[difftool "nvimdiff"]
|
|
|
|
|
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
|
2024-02-20 18:44:09 +01:00
|
|
|
[difftool "difftastic"]
|
|
|
|
|
cmd = difft "$LOCAL" "$REMOTE"
|
|
|
|
|
[pager]
|
|
|
|
|
difftool=true
|
|
|
|
|
[pull]
|
|
|
|
|
ff = true
|
|
|
|
|
[merge]
|
|
|
|
|
conflictstyle = zdiff3
|
|
|
|
|
[rebase]
|
|
|
|
|
autoSquash = true
|
|
|
|
|
[help]
|
|
|
|
|
autocorrect = prompt
|
|
|
|
|
[core]
|
|
|
|
|
pager = delta
|
|
|
|
|
[delta]
|
|
|
|
|
side-by-side = true
|
|
|
|
|
[branch]
|
|
|
|
|
sort = -committerdate
|
|
|
|
|
[status]
|
|
|
|
|
submodulesummary = true
|
2024-02-22 20:30:25 +01:00
|
|
|
[includeIf "gitdir:~/work/"]
|
|
|
|
|
path = ".config/git/work.gitconfig"
|
