summaryrefslogtreecommitdiffstats
path: root/git/config
blob: 2c2c73863abd220582ee5687a2faf7320ad4049e (plain) (blame)
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
[alias]
	st = status
	co = checkout
	fx = commit --fixup=HEAD
	ci = commit -v
	cm = commit -m
	ri = rebase -i --autosquash
	wc = whatchanged
	ass = add
	amend = commit --amend -v
	full = show --format=fuller
	noed = commit --amend --no-edit
	vl = log --color --stat --pretty=fuller
	tr = log --graph --date-order --date=short --pretty=format:'%C(cyan)%h%Creset -%C(auto)%d %C(yellow)%s %C(blue)(%ar) %Creset<%an>'
	fz = !sha=$( git -c color.ui=auto log --oneline -n 1000 | fzf +s --no-multi --prompt 'Fixup> ' ) && git commit --fixup "${sha%% *}"
	fr = !sha=$( git -c color.ui=auto log --oneline -n 1000 | fzf +s --no-multi --prompt 'Revert> ' ) && git revert "${sha%% *}"
	wd = "!f() { git --paginate diff --dirstat=cumulative,files,0 ${1:-HEAD} | awk '{print $2}' | cut -d / -f1-${2:-4} | sort | uniq; }; f"

[http]
  sslVerify = true

[core]
  autocrlf = input
  whitespace = warn
  excludesfile = /home/ghoul/.config/git/gitignore
  pager = "{                                                           \
      COLUMNS=$(tput cols);                                            \
      if [ $COLUMNS -ge 80 ] && [ -z $FZF_PREVIEW_COLUMNS ]; then      \
          delta --side-by-side -w $COLUMNS;                            \
      elif [ $COLUMNS -ge 160 ] && [ ! -z $FZF_PREVIEW_COLUMNS ]; then \
          delta --side-by-side -w $FZF_PREVIEW_COLUMNS;                \
      else                                                             \
          delta;                                                       \
      fi                                                               \
  }"

[interactive]
  diffFilter = delta --color-only

[delta]
  side-by-side = false
  line-numbers = true
  syntax-theme = gruvbox-dark
  hunk-header-style = omit
  file-style = blue
  file-decoration-style = blue ul ol
  zero-style = dim syntax
  minus-non-emph-style = dim red
  minus-emph-style = bold red 52
  minus-empty-line-marker-style = normal "#3f0001"
  plus-non-emph-style = dim green
  plus-emph-style = bold green 22
  plus-empty-line-marker-style = normal "#002800"
  whitespace-error-style = reverse white
  file-added-label = [+]
  file-copied-label = [C]
  file-modified-label = [M]
  file-removed-label = [-]
  file-renamed-label = [R]
  line-numbers-left-format = "{nm:>1} "
  line-numbers-right-format = "{np:>1} "
  line-numbers-minus-style = red italic
  line-numbers-plus-style = green italic

[web]
  browser = firefox

[credential]
  helper = /usr/local/libexec/git/git-credential-cache

[merge]
  log = true
  tool = nvimerge
  conflictstyle = diff3

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

[mergetool]
  prompt = false
  keepBackup = false

[diff]
  colorMoved = default
  algorithm = patience
  tool = nvimdiff
  renames = copies
  submodule = log

[difftool "nvimdiff"]
  cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
  trustexitcode = true

[commit]
  gpgsign = true
  verbose = true

[status]
  branch = true

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

[rerere]
  enabled = true

[grep]
  lineNumber = true
  extendRegexp = true

[gpg]
  program = gpg2

[log]
  decorate = short

[include]
  path = config.local

[help]
  autocorrect = 1
Un proyecto texto-plano.xyz