dotfiles/.gitconfig at main · simondanielsson/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
[user]
	email = simon.danielsson99@hotmail.com
	name = simondanielsson
  username = simondanielsson

[core]
  pager = delta
  editor = nvim

[interactive]
  diffFilter = delta --color-only

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

[merge]
  tool = nvimdiff4
  conflictstyle = diff3

[mergetool "nvimdiff4"]
  cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'

[diff]
  # Install with https://dandavison.github.io/delta/installation.html
  pager = delta
  colorMoved = default

[pull]
  rebase = false

[push]
  autoSetupRemote = true

[init]
  defaultBranch = main
[mergetool]
	keepBackup = false

[alias]
  b=branch '--sort=-committerdate'
  l=log '--oneline'
  s=status
  a=add
  c=commit
  d=diff
  ds=diff '--staged'
  pl=pull
  ps=push
  cp=cherry-pick
  w=worktree