|
|
@ -1,18 +1,21 @@
|
|
|
|
{{ if lookPath "git" -}}
|
|
|
|
{{ if lookPath "git" -}}
|
|
|
|
[core]
|
|
|
|
[core]
|
|
|
|
editor = vim
|
|
|
|
editor = vim
|
|
|
|
excludesfile = ~/.config/git/ignore
|
|
|
|
excludesfile = {{ .chezmoi.homeDir }}/.config/git/ignore
|
|
|
|
quotepath = false
|
|
|
|
quotepath = false
|
|
|
|
commitGraph = true
|
|
|
|
commitGraph = true
|
|
|
|
|
|
|
|
|
|
|
|
[color]
|
|
|
|
[color]
|
|
|
|
branch = auto
|
|
|
|
branch = auto
|
|
|
|
diff = auto
|
|
|
|
diff = auto
|
|
|
|
interactive = auto
|
|
|
|
interactive = auto
|
|
|
|
status = auto
|
|
|
|
status = auto
|
|
|
|
ui = auto
|
|
|
|
ui = auto
|
|
|
|
|
|
|
|
|
|
|
|
[user]
|
|
|
|
[user]
|
|
|
|
name = Buddy Sandidge
|
|
|
|
name = Buddy Sandidge
|
|
|
|
email = git@buddy.wtf
|
|
|
|
email = git@buddy.wtf
|
|
|
|
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
[alias]
|
|
|
|
br = branch
|
|
|
|
br = branch
|
|
|
|
ci = commit
|
|
|
|
ci = commit
|
|
|
@ -32,8 +35,6 @@
|
|
|
|
p = !git fetch --all
|
|
|
|
p = !git fetch --all
|
|
|
|
sup = submodule update
|
|
|
|
sup = submodule update
|
|
|
|
com = "!bash -c 'if [[ $(git rev-parse --verify main 2>/dev/null) ]] ; then git checkout main ; else git checkout master ; fi'"
|
|
|
|
com = "!bash -c 'if [[ $(git rev-parse --verify main 2>/dev/null) ]] ; then git checkout main ; else git checkout master ; fi'"
|
|
|
|
cod = checkout develop
|
|
|
|
|
|
|
|
pod = push origin develop
|
|
|
|
|
|
|
|
file = show --pretty="format:" --name-only
|
|
|
|
file = show --pretty="format:" --name-only
|
|
|
|
glog = !git log --pretty=oneline | grep
|
|
|
|
glog = !git log --pretty=oneline | grep
|
|
|
|
dpull = !git svn fetch && git svn rebase
|
|
|
|
dpull = !git svn fetch && git svn rebase
|
|
|
@ -49,18 +50,38 @@
|
|
|
|
ll = long-list
|
|
|
|
ll = long-list
|
|
|
|
list-date-stap = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
|
|
|
|
list-date-stap = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
|
|
|
|
lds = list-date-stap
|
|
|
|
lds = list-date-stap
|
|
|
|
|
|
|
|
|
|
|
|
[push]
|
|
|
|
[push]
|
|
|
|
default = simple
|
|
|
|
default = simple
|
|
|
|
[include]
|
|
|
|
|
|
|
|
path = ~/.config/git/config-git.buddy.wtf
|
|
|
|
|
|
|
|
path = ~/.config/git/config-git.xbudex.com
|
|
|
|
|
|
|
|
path = ~/.config/git/config-hellotech
|
|
|
|
|
|
|
|
[init]
|
|
|
|
[init]
|
|
|
|
defaultBranch = main
|
|
|
|
defaultBranch = main
|
|
|
|
|
|
|
|
|
|
|
|
[receive]
|
|
|
|
[receive]
|
|
|
|
advertisePushOptions = true
|
|
|
|
advertisePushOptions = true
|
|
|
|
|
|
|
|
|
|
|
|
[gc]
|
|
|
|
[gc]
|
|
|
|
writeCommitGraph = true
|
|
|
|
writeCommitGraph = true
|
|
|
|
|
|
|
|
|
|
|
|
[fetch]
|
|
|
|
[fetch]
|
|
|
|
prune = true
|
|
|
|
prune = true
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[url "ssh://git@git.buddy.wtf"]
|
|
|
|
|
|
|
|
insteadOf = https://git.buddy.wtf
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[url "ssh://git@git.xbudex.com:2022"]
|
|
|
|
|
|
|
|
insteadOf = https://git.xbudex.com
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{{ 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 }}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# vim: filetype=gitconfig
|
|
|
|
{{- end }}
|
|
|
|
{{- end }}
|
|
|
|