83 lines
2 KiB
Text
83 lines
2 KiB
Text
[alias]
|
|
cm = commit --verbose
|
|
co = checkout
|
|
l = log --graph --format='%C(auto)%h%d %s %C(10)%ad'
|
|
ln = log --graph --format='%C(auto)%h%d %s %C(10)%ad %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
|
|
|
|
[log]
|
|
date = human
|
|
|
|
[push]
|
|
default = upstream
|
|
|
|
[pull]
|
|
ff = only
|
|
|
|
[merge]
|
|
tool = vimdiff
|
|
|
|
[mergetool]
|
|
prompt = false
|
|
|
|
[mergetool "vimdiff"]
|
|
path = nvim
|
|
|
|
[filter "lfs"]
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
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
|
|
|
|
# Overrides for my dotfiles directory to make sure I never commit with the
|
|
# wrong e-mail address.
|
|
[includeIf "gitdir:~/.dotfiles/"]
|
|
path = ~/.config/git/dotfiles
|
|
|