daylin/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: update git config template

Browse source
This commit is contained in:
Daylin Morgan 2023-01-25 10:19:16 -06:00
parent e9f9c7876e
commit cdb6e1ca7b
1 changed files with 61 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
home/private_dot_config/git/config.tmpl
View file

@ -1,54 +1,73 @@
[credential]
helper = cache
[core] [core]
excludesfile = /home/{{- .chezmoi.username -}}/.config/git/ignore excludesfile = /home/{{- .chezmoi.username -}}/.config/git/ignore
[user] [user]
name = {{ .name }} name = {{ .name }}
email = {{ .email }} email = {{ .email }}
[credential]
helper = cache
[submodule] [submodule]
recurse = true recurse = true
[pull] [pull]
rebase = true rebase = true
[init] [init]
defaultBranch = main defaultBranch = main
[branch] [branch]
autosetuprebase = always autosetuprebase = always
[alias] [alias]
root = rev-parse --show-toplevel root = rev-parse --show-toplevel
adog = log --all --decorate --oneline --graph adog = log --all --decorate --oneline --graph
lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold cyan)%h%C(reset) ->%C(bold yellow)%d%C(reset) %C(white)%s%C(reset) %C(green)(%ar)%C(reset) %C(dim white)- %an%C(reset)' lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold cyan)%h%C(reset) ->%C(bold yellow)%d%C(reset) %C(white)%s%C(reset) %C(green)(%ar)%C(reset) %C(dim white)- %an%C(reset)'
last = log -1 HEAD --stat last = log -1 HEAD --stat
ll = log --oneline ll = log --oneline
st = status -sb st = status -sb
s = status -s s = status -s
dd = !git diff | delta dd = !git diff | delta
sd = !git show | delta sd = !git show | delta
co = checkout co = checkout
cob = checkout -b cob = checkout -b
br = branch --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative)) [%(authorname)]' --sort=-committerdate br = branch --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative)) [%(authorname)]' --sort=-committerdate
undo = reset HEAD~1 --mixed undo = reset HEAD~1 --mixed
wip = !git add -A && git commit -m \"wip: $(date +\"%Y.%m.%d %H:%M:%S\")\" wip = !git add -A && git commit -m \"wip: $(date +\"%Y.%m.%d %H:%M:%S\")\"
cmt = !git commit -m \"time: $(date +\"%Y.%m.%d %H:%M:%S\")\" cmt = !git commit -m \"time: $(date +\"%Y.%m.%d %H:%M:%S\")\"
save = !git add -A && git commit -m \"time: $(date +\"%Y.%m.%d %H:%M:%S\")\" save = !git add -A && git commit -m \"time: $(date +\"%Y.%m.%d %H:%M:%S\")\"
la = "!git config -l | grep alias | cut -c 7-" la = "!git config -l | grep alias | cut -c 7-"
gl = config --global -l gl = config --global -l
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[help] [help]
autocorrect = 20 autocorrect = 20
[delta] [delta]
line-numbers = true line-numbers = true
navigate = true # use n and N to move between diff sections
theme = catppuccin theme = catppuccin
; hunk-header-decoration-style = none ; hunk-header-decoration-style = none
diff-so-fancy = true diff-so-fancy = true
hunk-header-style = bold hunk-header-style = bold
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[merge]
conflictstyle = diff3
[diff]
colorMoved = default