-
-
Notifications
You must be signed in to change notification settings - Fork 7
Expand file tree
/
Copy pathconfig
More file actions
147 lines (147 loc) · 4.12 KB
/
Copy pathconfig
File metadata and controls
147 lines (147 loc) · 4.12 KB
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
[gui]
fontdiff = -family \"DejaVu Sans Mono\" -size 11 -weight normal -slant roman -underline 0 -overstrike 0
spellingdictionary = en_GB
[sendemail]
smtpserver = /usr/bin/msmtp
[color "diff"]
new = cyan bold #17
old = red bold #52
meta = green bold
frag = yellow bold
commit = white bold
newMoved = 157 bold
newMovedAlternative = 49 bold
oldMoved = 166 bold
oldMovedAlternative = 163 bold
[color "status"]
added = cyan bold
changed = red bold
untracked = yellow bold
[color "branch"]
upstream = brightgreen
[color]
ui = true
[user]
name = Tomas Janousek
email = tomi@nomi.cz
signingKey = 639DFD7BBFF09178
[push]
default = upstream
[pull]
rebase = true
[rebase]
autosquash = true
autoStash = true
[branch]
autosetuprebase = always
[init]
defaultBranch = main
[pretty]
fixes = Fixes: %h (\"%s\")
co-authored-by = Co-authored-by: %an <%ae>
[alias]
lg = log --color --graph --decorate
lgshort = log --color --graph --decorate --pretty=tformat:'%h\t%G? %aN\t%C(bold)%s%C(yellow)%d'
lgwdiff = log --color --graph --decorate -p --word-diff=color -w
lgmarkdown = "log --reverse --pretty=format:'#### [%s](../commit/%H)%n%n%b'"
wdiff = -c pager.diff='less -FRX' diff --word-diff=color -w
wshow = show --word-diff=color -w
puf = push --force-with-lease
puf-upstream = -c push.default=upstream push --force-with-lease
push-upstream = -c push.default=upstream push
dcommit = svn dcommit --rmdir --interactive
rev-sort-topo-reverse = rev-list --topo-order --no-walk --reverse
fixes = -c core.abbrev=12 log -1 --pretty=fixes
co-authored-by = log -1 --pretty=co-authored-by --regexp-ignore-case --author
unstatus = -c status.showUntrackedFiles=normal status
unigstatus = "!git ls-files | sed -n -e 's|^|./|; s|/\\.gitignore$||p' | xargs git unstatus"
resign = rebase -f -S
si-diff = -c pager.diff='delta --features=side' diff
si-show = -c pager.show='delta --features=side' show
si-range-diff = -c pager.range-diff='git-range-diff-delta-preproc | delta --features=side-range-diff' range-diff
[mergetool]
keepBackup = false
[merge]
tool = vimdiff
guitool = kdiff3
suppressDest = master
suppressDest = main
[diff]
tool = meld
algorithm = histogram
compactionHeuristic = true
indentHeuristic = true
colorMoved = default
colorMovedWS = allow-indentation-change
[diff "hex"]
textconv = hexdump -v -C
[interactive]
diffFilter = delta
[core]
pager = less -FRX --tabs=1,5
hooksPath = ~/.config/git/hooks
[pager]
diff = delta
show = delta
[delta]
features = diff-highlight
tabs = 4
[delta "diff-highlight"]
color-only = true
commit-style = raw
[delta "side"]
side-by-side = true
paging = always
commit-style = raw
file-style = bold 39 235
file-decoration-style = 39 235 ul ol
hunk-header-decoration-style = 245 235 box
hunk-header-line-number-style = 245 235
line-numbers-left-style = bold 245 233
line-numbers-right-style = bold 245 233
line-numbers-minus-style = 88 233
line-numbers-zero-style = 240 233
line-numbers-plus-style = 28 233
# colorMoved - newMoved, newMovedAlternative, oldMoved, oldMovedAlternative:
map-styles = bold 157 => syntax 24, bold 49 => syntax 29, bold 166 => syntax 54, bold 163 => syntax 89
[delta "side-nonum"]
features = side
hunk-header-style = syntax
line-numbers-left-format = ""
line-numbers-right-format = "│ "
line-numbers-right-style = 245
file-decoration-style = 39 235
[delta "side-range-diff"]
features = side-nonum
file-style = omit
[stash]
showPatch = true
[svn]
pushmergeinfo = true
[commit]
verbose = 1
#cleanup = scissors
[submodule]
fetchJobs = 0
[status]
submoduleSummary = true
[tig]
tab-size = 4
blame-options = -C -C -C
mouse = true
wrap-lines = true
diff-highlight = true
[tig "bind"]
generic = e !>tmux-new-window-or-exec vim +"%(lineno)" "%(file)"
generic = E !>tmux-new-window-or-exec vim +"%(lineno)" "fugitive://%(repo:git-dir)//%(commit)/%(file)"
generic = <Ctrl-S> !>tmux-new-window-or-exec git si-show "%(commit)"
[fetch]
prune = true
[completion]
commands = ls-files absorb
[url "ssh://git@github.com/"]
pushInsteadOf = https://github.com/
[includeIf "gitdir:~/src-haskell/xmonad*/"]
path = ~/.config/git/include/xmonad
[includeIf "gitdir:~/work/"]
path = ~/work/.gitconfig