79 lines
1.9 KiB
Text
79 lines
1.9 KiB
Text
# Color palette translation:
|
|
#
|
|
# Solarized Git/ANSI
|
|
# --------- --------
|
|
# base03 bold black
|
|
# base02 black
|
|
# base01 bold green
|
|
# base00 bold yellow
|
|
# base0 bold blue
|
|
# base1 bold cyan
|
|
# base2 white
|
|
# base3 bold white
|
|
# red red
|
|
# green green
|
|
# blue blue
|
|
# magenta magenta
|
|
# yellow yellow
|
|
# cyan cyan
|
|
# orange bold red
|
|
# violet bold magenta
|
|
|
|
[alias]
|
|
cm = commit --verbose
|
|
co = checkout
|
|
l = log --graph --format='%C(auto)%h%d %s %C(cyan)%ar'
|
|
ln = log --graph --format='%C(auto)%h%d %s %C(cyan)%ar %C(auto)by %C(bold magenta)%an <%ae>'
|
|
la = log --graph --format='%C(auto)%h%d %s %C(cyan)%ar' --all
|
|
lna = log --graph --format='%C(auto)%h%d %s %C(cyan)%ar %C(auto)by %C(bold magenta)%an <%ae>' --all
|
|
ll = log --graph --decorate --stat
|
|
lla = log --graph --decorate --stat --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.host # host-specific (from template)
|
|
path = ~/.local/etc/git/config # optional manual configurations
|