mirror of
https://github.com/webgefrickel/dotfiles
synced 2024-11-15 12:12:58 +00:00
71 lines
1.3 KiB
Plaintext
71 lines
1.3 KiB
Plaintext
[include]
|
|
path = ~/.gitconfig.user
|
|
|
|
[core]
|
|
excludesfile = ~/.gitignore
|
|
autocrlf = input
|
|
eol = lf
|
|
pager = diff-so-fancy | less --tabs=2 -RFX
|
|
|
|
[color]
|
|
ui = auto
|
|
|
|
[color "branch"]
|
|
current = yellow reverse
|
|
local = yellow
|
|
remote = green
|
|
|
|
[color "diff"]
|
|
meta = yellow
|
|
commit = green
|
|
frag = magenta
|
|
old = red
|
|
new = green
|
|
whitespace = red reverse
|
|
|
|
[color "diff-highlight"]
|
|
newNormal = green
|
|
newHighlight = green 22
|
|
oldNormal = red
|
|
oldHighlight = red 52
|
|
|
|
[color "status"]
|
|
added = yellow
|
|
changed = green
|
|
untracked = cyan
|
|
|
|
[alias]
|
|
git = !git
|
|
cl = clean -f -d
|
|
st = status
|
|
cm = commit
|
|
co = checkout
|
|
br = branch -a
|
|
ps = push
|
|
pl = pull
|
|
mg = merge
|
|
ffs = flow feature start
|
|
fff = flow feature finish
|
|
ffp = flow feature publish
|
|
fi = flow init
|
|
rs = reset HEAD --hard
|
|
hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
|
|
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit
|
|
lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
|
|
pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
|
|
|
|
[diff]
|
|
tool = nvim -d
|
|
guitool = nvim -d
|
|
compactionHeuristic = true
|
|
|
|
[mergetool]
|
|
prompt = false
|
|
keepBackup = false
|
|
|
|
[push]
|
|
default = simple
|
|
|
|
[interactive]
|
|
diffFilter = diff-highlight
|