dotfiles/gitconfig-common at master · Inanna84/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
[user]
  name = Inanna Panadero Guardeño

[alias]
  st = status
  co = checkout
  sw = switch
  undo = reset HEAD~1 --mixed
  please = push --force-with-lease
  lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
  lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit  --date-order
  lb = !git reflog show --pretty=format:'%gs ~ %gd' --date=relative | grep 'checkout:' | grep -oE '[^ ]+ ~ .*' | awk -F~ '!seen[$1]++' | head -n 10 | awk -F' ~ HEAD@{' '{printf(\"  \\033[33m%s: \\033[37m %s\\033[0m\\n\", substr($2, 1, length($2)-1), $1)}'

[rerere]
	enabled = true
	autoupdate = true

[merge]
  tool = kdiff3
  conflictstyle = diff3
  #conflictstyle = zdiff3

[merge "mergiraf"]
    name = mergiraf
    driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L

[mergetool "kdiff3"]
  conflictstyle = diff3
  cmd = QT_QPA_PLATFORM=xcb kdiff3 --auto --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"

[mergetool "kdiff3NoAuto"]
  conflictstyle = diff3
  cmd = QT_QPA_PLATFORM=xcb kdiff3 --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"

[mergetool "meld"]
	trustExitCode = false

[receive]
  fsckobjects = true

[push]
  default = simple

[pull]
  ff = only

[core]
  editor = nvim
  pager = delta

[delta]
  line-numbers = true
  navigate = true  # use n and N to move between diff sections
  dark = true      # or light = true, or omit for auto-detection

[interactive]
    diffFilter = delta --color-only