2018-07-20 16:50:04 -04:00
|
|
|
[push]
|
|
|
|
|
default = simple
|
|
|
|
|
|
|
|
|
|
[user]
|
|
|
|
|
name = Andrew Coleman
|
|
|
|
|
email = penguincoder@gmail.com
|
|
|
|
|
|
2020-07-15 12:56:17 -04:00
|
|
|
[advice]
|
|
|
|
|
detachedHead = false
|
|
|
|
|
|
2018-07-20 16:50:04 -04:00
|
|
|
[core]
|
|
|
|
|
filemode = true
|
|
|
|
|
eol = lf
|
|
|
|
|
autocrlf = input
|
2020-11-18 03:06:17 -05:00
|
|
|
pager = delta
|
|
|
|
|
|
2020-12-01 14:13:25 -05:00
|
|
|
[init]
|
|
|
|
|
defaultBranch = main
|
|
|
|
|
|
2020-11-18 03:06:17 -05:00
|
|
|
[delta]
|
2021-02-03 12:32:33 -05:00
|
|
|
features = decorations
|
|
|
|
|
line-numbers = true
|
2020-11-18 03:06:17 -05:00
|
|
|
syntax-theme = zenburn
|
|
|
|
|
|
|
|
|
|
[delta "decorations"]
|
2021-02-03 12:32:33 -05:00
|
|
|
commit-decoration-style = bold yellow box
|
|
|
|
|
file-style = bold yellow
|
|
|
|
|
file-decoration-style = yellow ul
|
|
|
|
|
hunk-header-style = omit
|
2020-11-18 03:06:17 -05:00
|
|
|
|
|
|
|
|
[rebase]
|
|
|
|
|
autoStash = true
|
2018-07-20 16:50:04 -04:00
|
|
|
|
2019-07-24 12:00:22 -04:00
|
|
|
[merge]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
conflictstyle = diff3
|
|
|
|
|
prompt = false
|
|
|
|
|
|
2020-07-15 12:42:13 -04:00
|
|
|
[pull]
|
2020-11-18 03:06:17 -05:00
|
|
|
rebase = true
|
2020-07-15 12:42:13 -04:00
|
|
|
|
2018-07-20 16:50:04 -04:00
|
|
|
[color]
|
|
|
|
|
branch = auto
|
|
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
|
|
|
|
ui = true
|
|
|
|
|
|
|
|
|
|
[color "branch"]
|
|
|
|
|
current = yellow reverse
|
|
|
|
|
local = yellow
|
|
|
|
|
remote = green
|
|
|
|
|
|
|
|
|
|
[color "diff"]
|
|
|
|
|
meta = yellow bold
|
|
|
|
|
frag = magenta bold
|
|
|
|
|
old = red bold
|
|
|
|
|
new = green bold
|
|
|
|
|
|
|
|
|
|
[color "status"]
|
|
|
|
|
added = yellow
|
|
|
|
|
changed = green
|
|
|
|
|
untracked = red
|
|
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
|
logp = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
|
2018-12-07 12:56:06 -05:00
|
|
|
lg = log --graph --date-order --first-parent \
|
2018-07-20 16:50:04 -04:00
|
|
|
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
|
|
|
|
lgb = log --graph --date-order --branches --first-parent \
|
|
|
|
|
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
|
|
|
|
lga = log --graph --date-order --all \
|
|
|
|
|
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
|
|
|
|
up = pull --rebase
|
2018-12-07 12:56:06 -05:00
|
|
|
branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
|
