dotfiles/dot_gitconfig at main · qw457812/dotfiles · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
[user]
    name = qw457812
    email = 37494864+qw457812@users.noreply.github.com

[color]
    ui = auto

[core]
    editor = nvim
    ; pager = diff-so-fancy | less --tabs=4 -RF
    pager = delta
    excludesfile = ~/.gitignore_global

[interactive]
    ; diffFilter = diff-so-fancy --patch
    diffFilter = delta --color-only

[include]
    path = ~/.local/share/nvim/lazy/tokyonight.nvim/extras/delta/tokyonight_moon.gitconfig

[delta]
    # use n and N to move between diff sections
    navigate = true
    dark = true
    ; side-by-side = true
    ; line-numbers = true

    ; syntax-theme = Nord
    syntax-theme = tokyonight_moon
    # https://github.com/dandavison/delta/blob/d5e0565cbfa47acde98d41d8777ace5d1bc4d690/themes.gitconfig
    ; minus-emph-style              = syntax auto
    minus-emph-style              = syntax bold "#860000" # #600000 #780000 #8e0000
    minus-style                   = syntax      "#550000" # #401010 #400000 #5e0000
    plus-style                    = syntax      "#004000" # #104010 #004000 #004800
    plus-emph-style               = syntax bold "#006800" # #006000 #007800 #007800
    minus-non-emph-style          = minus-style
    minus-empty-line-marker-style = minus-style
    plus-non-emph-style           = plus-style
    plus-empty-line-marker-style  = plus-style

    ; diff-so-fancy = true
    ; # delta --diff-highlight --show-config
    ; minus-emph-style = reverse red
    ; plus-emph-style = reverse green
    ; hunk-header-style = line-number syntax
    ; ; hunk-header-decoration-style = omit

    ; diff-highlight = true
    ; file-style = bold yellow
    ; file-decoration-style = yellow ol ul
    # https://dandavison.github.io/delta/configuration.html
    ; hunk-header-decoration-style = blue box
    ; hunk-header-style = line-number syntax

    commit-decoration-style = bold yellow ul

[diff]
    algorithm = histogram
    colorMoved = default
    # Better submodule diffs
    submodule = log
    tool = nvim_difftool

[difftool "nvim_difftool"]
    cmd = nvim -c \"packadd nvim.difftool\" -d \"$LOCAL\" \"$REMOTE\"

[merge]
    tool = nvimdiff
    conflictstyle = zdiff3

[pull]
    rebase = true

[push]
    autoSetupRemote = true

[rebase]
    autoStash = true
    autoSquash = true
    ; updateRefs = true

[commit]
    verbose = true
    ; template = ~/.stCommitMsg

[init]
    defaultBranch = main

[filter "lfs"]
    process = git-lfs filter-process
    required = true
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f

[alias]
    st = status
    co = checkout
    sw = switch
    br = branch
    c = commit
    ci = commit
    br = branch
    p = push
    pf = push --force-with-lease --force-if-includes
    l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=short
    ll = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
    discard = checkout --
    unstage = reset HEAD --
    uncommit = reset --soft HEAD^
    amend = commit --amend --no-edit
    unamend = reset --soft HEAD@{1}
    fixup = commit --fixup
    fixup-rebase = "!f() { git commit --fixup \"$1\" && git rebase -i --autosquash \"$1~1\"; }; f"

[help]
    autocorrect = prompt

[log]
    date = auto:human

[credential "https://github.com"]
    helper = !gh auth git-credential
[credential "https://gist.github.com"]
    helper = !gh auth git-credential