summaryrefslogtreecommitdiff
path: root/mac/.config/git/config
blob: 0324918df8f1eaedf7c527cffbba6c8a56fef0f4 (plain)
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
[advice]
  detachedHead = false
[core]
  autocrlf = input
  excludesFile = ~/.config/git/ignore
  pager = delta
	quotepath = false
[color "status"]
  added = green
  branch = bold magenta
  changed = yellow
  untracked = blue
[credential]
  helper = cache
  helper = store
  helper = !type pass-git-helper >/dev/null && pass-git-helper$@
[delta]
  blame-code-style = syntax
  blame-palette = "#161617" "#1b1b1d" "#2a2a2d" "#3e3e43"
  dark = true
  features = mellow-barbet
  file-style = brightwhite
  file-decoration-style = none
  file-added-label = [+]
  file-copied-label = [==]
  file-modified-label = [*]
  file-removed-label = [-]
  file-renamed-label = [->]
  hunk-header-decoration-style = "#3e3e43" box ul
  line-numbers = true
  line-numbers-minus-style = brightred
  line-numbers-plus-style = brightgreen
  line-numbers-left-style = "#3e3e43"
  line-numbers-right-style = "#3e3e43"
  line-numbers-zero-style = "#57575f"
  merge-conflict-begin-symbol = ~
  merge-conflict-end-symbol = ~
  merge-conflict-ours-diff-header-style = yellow bold
  merge-conflict-ours-diff-header-decoration-style = "#3e3e43" box
  merge-conflict-theirs-diff-header-style = yellow bold
  merge-conflict-theirs-diff-header-decoration-style = "#3e3e43" box
  minus-style = brightred black
  minus-emph-style = black red
  navigate = true    # use n and N to move between diff sections
  plus-style = brightgreen black
  plus-emph-style = black green
  syntax-theme = base16
  side-by-side = false
  true-color = auto
  whitespace-error-style = black bold
  zero-style = syntax
[diff]
  colorMoved = default
  tool = vscode
[difftool "vscode"]
  cmd = code --wait --diff $LOCAL $REMOTE
[include]
  path = ~/.config/git/themes.gitconfig
[init]
  defaultBranch = master
[interactive]
  diffFilter = delta --color-only
[merge]
  tool = vscode
	conflictstyle = zdiff3
[mergetool]
  keepBackup = false
[mergetool "vscode"]
	cmd = code --wait --merge $LOCAL $REMOTE $BASE $MERGED
[pager]
  branch = false
  diff = delta
  log = delta
  reflog = delta
  show = delta
[pull]
  rebase = true
  twohead = ort
[rerere]
  enabled = true
[submodule]
  recurse = true
[user]
  name = TheSiahxyz
  email = 164138827+TheSiahxyz@users.noreply.github.com
  signingkey = 67BE7AD056C803BA
[commit]
  gpgsign = true