mirror of
https://github.com/dnlbauer/dotfiles.git
synced 2026-09-10 13:35:30 +00:00
72 lines
1.7 KiB
Cheetah
72 lines
1.7 KiB
Cheetah
#git config --global rerere.enabled true This is Git's per-user configuration file.
|
|
[user]
|
|
# Please adapt and uncomment the following lines:
|
|
name = Daniel Bauer
|
|
email = {{ .github_email | quote }}
|
|
[core]
|
|
pager = sh -c 'command -v diff-so-fancy >/dev/null && exec diff-so-fancy || less --tabs=4 -RX'
|
|
pager = less
|
|
autocrlf = input
|
|
attributesFile = {{ .chezmoi.homeDir }}/.gitattributes
|
|
[alias]
|
|
co = commit
|
|
ch = checkout
|
|
br = branch
|
|
worktree-ai = "!~/bin/git-worktree-ai"
|
|
[interactive]
|
|
diffFilter = sh -c 'command -v diff-so-fancy >/dev/null && exec diff-so-fancy --patch || exec cat'
|
|
[color]
|
|
ui = true
|
|
[color "diff-highlight"]
|
|
oldNormal = red bold
|
|
oldHighlight = red bold 52
|
|
newNormal = green bold
|
|
newHighlight = green bold 22
|
|
[color "diff"]
|
|
meta = 11
|
|
frag = magenta bold
|
|
func = 146 bold
|
|
commit = yellow bold
|
|
old = red bold
|
|
new = green bold
|
|
whitespace = red reverse
|
|
[rerere]
|
|
enabled = true
|
|
[diff]
|
|
noprefix = true
|
|
colorMoved = True
|
|
[commit]
|
|
verbose = true
|
|
[color "status"]
|
|
added = green
|
|
changed = red
|
|
deleted = blue
|
|
untracked = cyan
|
|
[push]
|
|
default = current
|
|
[init]
|
|
defaultBranch = main
|
|
[include]
|
|
path = ~/.gitconfig.local
|
|
[pull]
|
|
rebase = false
|
|
[credential]
|
|
helper = store
|
|
[gpg]
|
|
program = /usr/bin/gpg
|
|
[include]
|
|
path = ~/.gitconfig.local
|
|
[diff "jupyternotebook"]
|
|
command = git-nbdiffdriver diff
|
|
[merge "jupyternotebook"]
|
|
driver = git-nbmergedriver merge %O %A %B %L %P
|
|
name = jupyter notebook merge driver
|
|
[difftool "nbdime"]
|
|
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
|
|
[difftool]
|
|
prompt = false
|
|
[mergetool "nbdime"]
|
|
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
|
|
[mergetool]
|
|
prompt = false
|