2016-06-14 19:21:43 +00:00
|
|
|
[core]
|
2019-05-24 17:59:58 +00:00
|
|
|
excludesfile = ~/.gitignore
|
|
|
|
|
editor = vim
|
|
|
|
|
whitespace = trailing-space,space-before-tab
|
|
|
|
|
autocrlf = false
|
|
|
|
|
safecrlf = true
|
|
|
|
|
preloadindex = 1
|
|
|
|
|
pager = less -R
|
2016-06-14 19:21:43 +00:00
|
|
|
[apply]
|
2019-05-24 17:59:58 +00:00
|
|
|
whitespace = fix
|
2016-06-14 19:21:43 +00:00
|
|
|
[color]
|
2019-05-24 17:59:58 +00:00
|
|
|
ui = auto
|
|
|
|
|
interactive = true
|
|
|
|
|
status = true
|
|
|
|
|
branch = true
|
|
|
|
|
diff = true
|
2016-06-14 19:21:43 +00:00
|
|
|
[push]
|
2019-05-24 17:59:58 +00:00
|
|
|
default = tracking
|
2016-06-14 19:21:43 +00:00
|
|
|
[alias]
|
2019-05-24 17:59:58 +00:00
|
|
|
lol = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
|
|
|
|
st = status -sb
|
|
|
|
|
lerl = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
|
|
|
|
changelog = log --graph --pretty=format:'[%h] -%d %s (%cr) (%an)' --abbrev-commit --no-merges
|
|
|
|
|
df = diff
|
|
|
|
|
rpull = pull --rebase --stat
|
|
|
|
|
pullr = pull --rebase
|
|
|
|
|
unstage = reset
|
|
|
|
|
dfc = diff --cached
|
|
|
|
|
mergemaster = mergetool
|
|
|
|
|
ci = commit -v
|
|
|
|
|
push-with-tags = !git push && git push --tags
|
|
|
|
|
pull-with-submodules = !git pull && git submodule update --init
|
|
|
|
|
rpull-with-submodules = !git pull --rebase --stat && git submodule update --init
|
2020-03-02 21:02:29 +00:00
|
|
|
freeze = !git-freeze
|
2020-09-28 19:50:22 +00:00
|
|
|
tags = log -n1 --pretty=format:%h%d
|
2016-06-14 19:21:43 +00:00
|
|
|
[merge]
|
2019-05-24 17:59:58 +00:00
|
|
|
tool = vimdiff
|
2016-06-14 19:21:43 +00:00
|
|
|
[mergetool "fugitive"]
|
2019-05-24 17:59:58 +00:00
|
|
|
cmd = fugitive vim -f -c \"Gdiff\" \"$MERGED\"
|
2016-06-14 19:21:43 +00:00
|
|
|
[user]
|
2019-05-01 17:23:23 +00:00
|
|
|
email = dtodd@oceantech.com
|
|
|
|
|
name = David Todd
|
2016-06-14 19:21:43 +00:00
|
|
|
[include]
|
2019-05-24 17:59:58 +00:00
|
|
|
path = ~/.githubtokens
|
|
|
|
|
path = ~/.dotoverrides/gitconfig
|
|
|
|
|
[diff]
|
|
|
|
|
guitool = kdiff3
|
|
|
|
|
[difftool "kdiff3"]
|
|
|
|
|
path = /usr/bin/kdiff3
|
2020-09-28 19:50:22 +00:00
|
|
|
[pull]
|
|
|
|
|
rebase = true
|
