Dotfiles/gitconfig at main · mdentremont/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
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
[alias]
  a = add
  b = branch
  bv = branch -vv
  ci = commit -v
  clf = clean -dfx -e '.gradle' -e 'gradle.properties' -e 'local.properties' -e '.idea' -e '*.iml'
  co = checkout
  cp = cherry-pick
  cpx = cherry-pick -x
  d = diff
  dc = diff --cached
  dt = difftool
  dtc = difftool --cached
  f = fetch --prune
  fpr = "!git-fpr"
  fa = fetch --all --prune
  fixup = commit --amend --no-edit
  l = log
  lg = log --graph
  lp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
  lost = "!git-lost"
  m = merge
  mt = mergetool
  pl = pull
  pr = pull-request
  ps = push
  r = rm
  rb = rebase
  rc = rebase --continue
  s = status -sb
  su = submodule update --init --recursive
  t = tag
  ws = diff --check
  wt = worktree
  desk = stash
  wip = "!git-wip"
  unwip = "!git-unwip"
  head = !git log -n1
  find-merge = "!git-find-merge"
  clearvs = clean -dX -f -- 'TG*/bin' 'TG*/obj'

[branch]
  sort = -committerdate

[color]
  ui = 1
  branch = auto
  diff = auto
  interactive = auto
  status = auto

[core]
  autocrlf = input
  editor = nvim
  excludesfile = ~/.gitignore_global
  fileMode = false
  safecrlf = false
  pager = delta --24-bit-color=always --dark --keep-plus-minus-markers

[delta]
  plus-color = "#012800"
  minus-color = "#340001"
  syntax-theme = Monokai Extended Origin

[diff]
  tool = bc-windows
  algorithm = histogram
  colorMoved = plain
  mnemonicPrefix = true
  renames = true

[difftool]
  prompt = false

[difftool "bc-windows"]
  cmd = bcomp -automerge \"$LOCAL\" \"$REMOTE\"

[fetch]
  prune = true
  pruneTags = true
  all = true

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

[grep]
  lineNumber = true
  trustExitCode = true

[gui]
  gcwarning = false
  commitmsgwidth = 80
  tabsize = 4

[help]
  autocorrect = prompt

[hub]
  protocol = https

[include]
  path = /Users/mattdentremont/.config/dev/gitconfig

[init]
  defaultBranch = main

[interactive]
  diffFilter = delta --24-bit-color=always --dark --color-only --keep-plus-minus-markers

[log]
  date = local

[merge]
  tool = bc-windows
  guitool = bc-windows

[mergetool]
  prompt = false
  keepBackup = false

[mergetool "auto"]
  keepBackup = false
  trustExitCode = true
  cmd = bcomp -automerge -ignoreunimportant -reviewconflicts \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

[mergetool "bc-windows"]
  keepBackup = false
  trustExitCode = true
  cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

[pull]
  rebase = false

[push]
  default = nothing

[rebase]
  autoStash = false

[rerere]
  enabled = 1

[tag]
  sort = version:refname

[user]
  email = matt.dentremont@shopify.com
  name = Matt d'Entremont