66 lines
1.8 KiB
Cheetah
66 lines
1.8 KiB
Cheetah
[user]
|
|
name = {{ .name }}
|
|
{{- if eq .hosttype "work" }}
|
|
email = {{ .email_work }}
|
|
{{- else }}
|
|
email = {{ .email_personal }}
|
|
{{- end }}
|
|
[core]
|
|
editor = hx
|
|
excludesFiles = ~/.config/git/ignore
|
|
{{ if eq .hosttype "work" }}
|
|
sshCommand = "ssh -i ~/.ssh/id_rsa_work"
|
|
{{ end }}
|
|
[diff]
|
|
colorMoved = default
|
|
[color]
|
|
diff = auto
|
|
status = auto
|
|
branch = auto
|
|
interactive = auto
|
|
ui = auto
|
|
[gc]
|
|
auto = 1
|
|
[merge]
|
|
summary = true
|
|
conflictstyle = diff3
|
|
prompt = false
|
|
[alias]
|
|
# http://stackoverflow.com/a/9074343
|
|
lg1 = log \
|
|
--graph \
|
|
--abbrev-commit \
|
|
--decorate \
|
|
--format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' \
|
|
--all
|
|
lg2 = log \
|
|
--graph \
|
|
--abbrev-commit \
|
|
--decorate \
|
|
--format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' \
|
|
--all
|
|
lg = !"git lg1"
|
|
# https://gist.github.com/mwhite/6887990
|
|
a = add
|
|
c = commit --verbose
|
|
ca = commit -a --verbose
|
|
d = diff
|
|
s = status -s
|
|
sw = switch
|
|
swc = switch -c
|
|
# list branches sorted by last modified
|
|
b = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'"
|
|
# list aliases
|
|
la = "!git config -l | grep alias | cut -c 7-"
|
|
[pull]
|
|
rebase = true
|
|
[init]
|
|
defaultBranch = main
|
|
|
|
{{ if eq .hosttype "work" -}}
|
|
[includeIf "gitdir:~/projects/personal/"]
|
|
path = ~/.gitconfig-personal-override
|
|
|
|
[includeIf "gitdir:~/.local/share/chezmoi/"]
|
|
path = ~/.gitconfig-personal-override
|
|
{{- end }}
|