mirror of
https://github.com/Stunkymonkey/dotfiles.git
synced 2025-10-30 18:02:10 +01:00
55 lines
1.2 KiB
Text
55 lines
1.2 KiB
Text
[color]
|
|
diff = auto
|
|
status = auto
|
|
branch = auto
|
|
ui = true
|
|
[user]
|
|
name = Felix Buehler
|
|
email = account@buehler.rocks
|
|
[merge]
|
|
defaultToUpstream = true
|
|
tool = vimdiff
|
|
template = ~/.git/review-template
|
|
[core]
|
|
editor = vim
|
|
eol = native
|
|
pager = diff-so-fancy | less --tabs=4 -RFX
|
|
[alias]
|
|
ct = log --graph --decorate --pretty=oneline --abbrev-commit
|
|
committree = log --graph --decorate --pretty=oneline --abbrev-commit
|
|
d = difftool
|
|
git = !exec git
|
|
[rerere]
|
|
enabled = true
|
|
[branch]
|
|
autoSetupMerge = always
|
|
[remote "origin"]
|
|
fetch = +refs/pull/*/head:refs/remotes/origin/pull/*
|
|
fetch = +refs/heads/*:refs/remotes/origin/*
|
|
[remote "upstream"]
|
|
fetch = +refs/pull/*/head:refs/remotes/upstream/pull/*
|
|
fetch = +refs/heads/*:refs/remotes/upstream/*
|
|
[diff]
|
|
tool = vimdiff
|
|
[difftool]
|
|
prompt = false
|
|
[color "diff-highlight"]
|
|
oldNormal = red
|
|
oldHighlight = red bold 52
|
|
newNormal = green
|
|
newHighlight = green bold 22
|
|
[filter "lfs"]
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
required = true
|
|
[credential]
|
|
helper = /usr/bin/git-credential-gnome-keyring
|
|
[rebase]
|
|
autosquash = true
|
|
[color "diff"]
|
|
meta = yellow bold
|
|
commit = yellow bold
|
|
frag = magenta bold
|
|
old = red bold
|
|
new = green bold
|
|
whitespace = red reverse
|