-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
144 lines (140 loc) · 3.92 KB
/
.gitconfig
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
# vim: tabstop=4:softtabstop=4:shiftwidth=4:noexpandtab:
[color]
ui = auto
;diff = true
;status = true
;branch = auto
;ui = true
[core]
#autocrlf = input
editor = lvim
pager = delta
fileMode = true
[pager]
#log = diff-highlight | batcat
#show = diff-highlight | batcat
#diff = diff-highlight | batcat
[interactive]
#diffFilter="diff-highlight"
diffFilter = delta --color-only
[alias]
co = checkout
ci = commit
d = diff
dst = diff --staged
dtool = difftool
niced = diff -w --word-diff-regex=[^[:space:]]
wd = diff --word-diff
r = rebase
lg = log --graph --pretty=tformat:'%Cred%h%Creset %C(bold blue)%<(20,trunc)%an%Creset %C(auto)%d%Creset %s %Cgreen(%cr) '
# git lg master.. -> what I'm going to PR? -> w
w = log --graph --pretty=tformat:'%Cred%h%Creset %C(bold blue)%<(20,trunc)%an%Creset %C(auto)%d%Creset %s %Cgreen(%cr) ' origin/HEAD..
wd = diff origin/HEAD
ch = cherry-pick
s = status
br = branch
# tidy on master
t = rebase -i origin/HEAD --autosquash
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
oops = commit --amend -C HEAD
fuckthis = reset --hard HEAD~1
ohnoo = reset --hard ORIG_HEAD
fixup = !git commit --fixup `git log origin/HEAD..HEAD --oneline | fzf --ansi --preview=\"git show --color=always $(echo {1} | awk '{print $1}')\" | awk '{print $1}'`
itsme = commit -C HEAD --amend --reset-author
b = !git branch | fzf --ansi --preview=\"git w --color=always {1}\" --multi | xargs
[diff]
mnemonicPrefix = true
renames = copies
colorMoved = true
tool = delta
#[difftool "colordiff"]
# cmd="colordiff --side-by-side $LOCAL $REMOTE"
[fetch]
recurseSubmodules = on-demand
[grep]
extendedRegexp = true
[log]
abbrevCommit = true
; [merge]
; tool = vimdiff
; conflictStyle = diff3
; [mergetool]
; prompt = false
# define command which will be used when "lvim" is set as a merge tool
[mergetool "nvim"]
cmd = "nvim -d -c \":split $MERGED\" -c \":wincmd k\" -c \":vsplit $BASE\" -c \":vsplit $REMOTE\" $LOCAL"
# set "lvim" as tool for merging
[merge]
tool = nvim
layout = LOCAL
; conflictStyle = diff3
[mergetool]
prompt = false
; [mergetool]
# automatically launch merge tool without displaying a prompt
[pull]
rebase = merges
[push]
default = upstream
autoSetupRemote = true
[rerere]
autoupdate = true
enabled = true
[status]
submoduleSummary = true
showUntrackedFiles = all
[http]
cookiefile = ~/.gitcookies
[commit]
template = ~/.git_commit_msg.txt
[branch]
autoSetupMerge = false
[url "https://anongit.kde.org/"]
insteadOf = kde:
[url "git@git.kde.org:"]
pushInsteadOf = kde:
[delta]
features = line-numbers decorations
whitespace-error-style = 22 reverse
features = hoopoe
side-by-side = true
[delta "hoopoe"]
# author: https://github.com/dandavison
# copied from https://raw.githubusercontent.com/dandavison/delta/master/themes.gitconfig
light = true
pink = "#ffe0e0"
dark-pink = "#ffc0c0"
green = "#d0ffd0"
dark-green = "#a0efa0"
dark-green-2 = "#067a00"
minus-style = normal hoopoe.pink
minus-emph-style = normal hoopoe.dark-pink
minus-non-emph-style = minus-style
plus-style = syntax hoopoe.green
plus-emph-style = syntax hoopoe.dark-green
plus-non-emph-style = plus-style
minus-empty-line-marker-style = minus-style
plus-empty-line-marker-style = plus-style
commit-decoration-style = blue ol
commit-style = raw
file-style = omit
hunk-header-decoration-style = blue box
hunk-header-file-style = red
hunk-header-line-number-style = hoopoe.dark-green-2
hunk-header-style = file line-number syntax
syntax-theme = GitHub
zero-style = syntax
[delta "decorations"]
; commit-decoration-style = bold yellow box ul
; file-style = bold yellow ul
file-decoration-style = none
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
# local modif for email for instance
[include]
path = ~/.localgitconfig
[init]
defaultBranch = main