dotfiles/gitconfig at main · andybluntish/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
[user]
  name = Andy Stanford-Bluntish
  email = andy@bluntish.net

[github]
  user = andybluntish

[core]
  pager = delta
  excludesfile = ~/.gitignore

[apply]
  whitespace = fix

[color]
  ui = true

[alias]
  a = add
  ap = add --patch
  b = branch
  c = commit --verbose
  co = checkout
  cp = cherry-pick
  d = diff
  dc = diff --cached
  dl = diff HEAD^
  dw = diff --color-words
  dcw = diff --cached --color-words
  f = fetch
  l = log --pretty=oneline --max-count 20 --graph --abbrev-commit
  m = merge
  p = push
  pl = pull
  s = status --short

  amend = commit --amend
  conflicts = diff --name-only --diff-filter=U
  uncommit = reset --soft HEAD^
  unstage = reset HEAD

  cb = rev-parse --symbolic-full-name --abbrev-ref HEAD
  gp = !git push --set-upstream origin HEAD:$(git cb)
  suo = !git branch -u origin/$(cb)
  gup = pull --prune --rebase=merges

[delta]
  features = side-by-side decorations
  navigate = true

[delta "decorations"]
  commit-decoration-style = bold yellow box ul
  file-style = bold yellow ul
  file-decoration-style = none
  hunk-header-decoration-style = blue box ul

[interactive]
  diffFilter = delta --color-only

[init]
  defaultBranch = main

[merge]
  tool = nvimdiff
  conflictStyle = zdiff3

[push]
  default = upstream
  autoSetupRemote = true