You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
125 lines
3.0 KiB
Cheetah
125 lines
3.0 KiB
Cheetah
# chezmoi:template:left-delimiter=#{{
|
|
# chezmoi:template:right-delimiter=}}#
|
|
#{{- /* vim: set filetype=gitconfig: */ -}}#
|
|
#{{ if lookPath "git" -}}#
|
|
[core]
|
|
editor = vim
|
|
excludesfile = #{{ .chezmoi.homeDir }}#/.config/git/ignore
|
|
quotepath = false
|
|
commitGraph = true
|
|
logallrefupdates = true
|
|
#{{- if lookPath "delta" }}#
|
|
pager = delta
|
|
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
|
|
[delta]
|
|
navigate = true # use n and N to move between diff sections
|
|
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
|
|
line-numbers = true
|
|
|
|
[merge]
|
|
conflictstyle = diff3
|
|
#{{- end }}#
|
|
|
|
[color]
|
|
branch = auto
|
|
diff = auto
|
|
interactive = auto
|
|
status = auto
|
|
ui = auto
|
|
|
|
[user]
|
|
name = Buddy Sandidge
|
|
email = git@buddy.wtf
|
|
|
|
[alias]
|
|
br = branch
|
|
ci = commit
|
|
co = checkout
|
|
cp = cherry-pick
|
|
cw = diff --color-words
|
|
ccw = diff --color-words --cached
|
|
df = diff --ignore-space-change
|
|
dfw = diff --ignore-space-change --color-words
|
|
dfc = diff --ignore-space-change --cached
|
|
dfcw = diff --ignore-space-change --color-words --cached
|
|
dmw = diff --ignore-space-change --color-words master
|
|
dmn = diff master --name-only
|
|
st = status -sb
|
|
dm = diff master
|
|
dmcw = diff master --color-words
|
|
p = !git fetch --all
|
|
sup = submodule update
|
|
com = "!bash -c 'if [[ $(git rev-parse --verify main 2>/dev/null) ]] ; then git checkout main ; else git checkout master ; fi'"
|
|
file = show --pretty="format:" --name-only
|
|
glog = !git log --pretty=oneline | grep
|
|
dpull = !git svn fetch && git svn rebase
|
|
dcommit = svn dcommit
|
|
lg = log --graph --pretty=format:'%Cred%h%Creset %s%Cred%d%Creset %Cgreen(%cr by %cN)%Creset'
|
|
fix-last-commit = commit --amend
|
|
flc = fix-last-commit
|
|
rmbr = push origin --delete
|
|
# http://durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/
|
|
list = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
|
|
ls = list
|
|
long-list = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
|
|
ll = long-list
|
|
list-date-stap = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
|
|
lds = list-date-stap
|
|
|
|
[push]
|
|
default = simple
|
|
|
|
[pull]
|
|
rebase = false
|
|
|
|
[init]
|
|
defaultBranch = main
|
|
|
|
[receive]
|
|
advertisePushOptions = true
|
|
procReceiveRefs = refs/for
|
|
|
|
[gc]
|
|
writeCommitGraph = true
|
|
reflogexpire = 90
|
|
|
|
[fetch]
|
|
prune = true
|
|
writeCommitGraph = true
|
|
|
|
[diff]
|
|
algorithm = histogram
|
|
#{{- if lookPath "delta" }}#
|
|
colorMoved = default
|
|
#{{- end }}#
|
|
|
|
[safe]
|
|
directory = *
|
|
|
|
[uploadpack]
|
|
allowfilter = true
|
|
allowAnySHA1InWant = true
|
|
|
|
#{{ if .development -}}#
|
|
[url "ssh://git@git.buddy.wtf"]
|
|
insteadOf = https://git.buddy.wtf
|
|
|
|
[url "ssh://git@git.xbudex.com:2022"]
|
|
insteadOf = https://git.xbudex.com
|
|
#{{- end }}#
|
|
|
|
#{{ if .hellotech -}}#
|
|
[url "git@github.com:HelloTech"]
|
|
insteadOf = https://github.com/HelloTech
|
|
email = buddy@hellotech.com
|
|
|
|
#{{ if lookPath "node" -}}#
|
|
[init]
|
|
templateDir = #{{ .chezmoi.homeDir }}#/.config/git/template
|
|
#{{- end }}#
|
|
#{{- end }}#
|
|
#{{- end }}#
|