[alias] b = branch bv = b -vv ba = bv --all cm = commit --verbose co = checkout d = diff dc = d --cached ds = !GIT_PAGER=\"delta-wrapper --side-by-side\" git diff dcs = ds --cached l = log --graph --pretty=basic ln = log --graph --pretty=name ll = log --graph --decorate --stat lp = log -p la = l --all lna = ln --all lla = ll --all s = status --short ss = status [pretty] basic = %C(auto)%h%d %s %C(8) %ad name = %C(auto)%h%d %s %n%C(2)%aN <%C(10)%aE%C(2)> %C(8) %ad %n [core] excludesfile = ~/.config/git/ignore trustctime = false # http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/ pager = delta-wrapper [init] defaultBranch = main [log] date = human [delta] features = gruvbox commit-style = raw file-modified-label = "modified:" hunk-header-style = omit line-numbers = true syntax-theme = Nord [include] path = delta.gitconfig [push] default = upstream [pull] ff = only [diff] colorMoved = default [merge] tool = vimdiff conflictstyle = diff3 [mergetool] prompt = false [mergetool "vimdiff"] path = nvim [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true # Color palette translation: # # Solarized Git/ANSI Solarized Git/ANSI # --------- -------- --------- -------- # base03 8 red 1 # base02 0 green 2 # base01 10 blue 4 # base00 11 magenta 5 # base0 12 yellow 3 # base1 14 cyan 6 # base2 7 orange 9 # base3 15 violet 13 [color] ui = auto [color "decorate"] branch = blue remoteBranch = bold red # orange tag = green stash = bold magenta HEAD = cyan [color "diff"] meta = blue frag = bold magenta # violet in solarized old = red new = green [color "status"] added = green changed = red untracked = cyan [include] path = ~/.local/etc/git/config.user # user name & e-mail (from template) path = ~/.local/etc/git/config # optional manual configurations # Never commit my dotfiles or personal projects with the wrong e-mail address. [includeIf "gitdir:~/.dotfiles/"] path = ~/.config/git/dev@schauenburg.me [includeIf "gitdir:~/.local/src/"] path = ~/.config/git/dev@schauenburg.me