# Color palette translation: # # Solarized Git/ANSI # --------- -------- # base03 8 # base02 0 # base01 10 # base00 11 # base0 12 # base1 14 # base2 7 # base3 15 # red 1 # green 2 # blue 4 # magenta 5 # yellow 3 # cyan 6 # orange 9 # violet 13 [alias] cm = commit --verbose co = checkout l = log --graph --format='%C(auto)%h%d %s %C(10)%ar' ln = log --graph --format='%C(auto)%h%d %s %C(10)%ar %C(auto)by %C(10)%an<%ae>' ll = log --graph --decorate --stat la = l --all lna = ln --all lla = ll --all s = status --short ss = status [core] excludesfile = ~/.config/git/ignore trustctime = false # http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/ pager = less -F -X [push] default = nothing [merge] tool = vimdiff [mergetool] prompt = false [mergetool "vimdiff"] path = nvim [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 [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f required = true [include] path = ~/.local/etc/git/config.user # user name & e-mail (from template) path = ~/.local/etc/git/config # optional manual configurations