-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
93 lines (93 loc) · 2.07 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
[alias]
vgrep = "!f () { git grep --color=always \"$@\" | vgrep; }; f"
ci = commit
s = status
st = stash
sp = stash pop
f = fetch
r = rebase
ri = rebase -i
p = push
pf = push --force-with-lease
pu = "!git push -u ${1:-origin} $(git rev-parse --abbrev-ref HEAD)"
co = checkout
up = pull --rebase
lg = log --oneline
last = log -1 HEAD
c = log -p -w --reverse @{u}..
b = branch -vv
fix = commit --amend --no-edit
reword = commit --amend
d = diff
ds = diff --staged
dw = diff --color-words
dww = diff --color-words="[^[:space:],;:_]+"
imerge = mergetool --tool=intellij
idiff = difftool --tool=intellij
[color]
diff = auto
status = auto
branch = auto
[commit]
verbose = true
[core]
pager = delta
[delta]
navigate = true
light = false
commit-decoration-style = ul ol bold red
commit-style = bold raw
hunk-header-decoration-style = none
line-numbers = true
keep-plus-minus-markers = false
[interactive]
diffFilter = delta --color-only
[push]
default = simple
[user]
email = [email protected]
name = Franz Thoma
[clean]
requireForce = false
[rebase]
autostash = true
autosquash = true
[merge]
tool = meld
conflictstyle = diff3
[mergetool "intellij"]
cmd = idea-ultimate merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[diff]
tool = meld
colorMoved = default
[difftool "intellij"]
cmd = idea-ultimate diff \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[log]
mailmap = true
[grep]
lineNumber = true
[url "git://github.com/ghc/packages-"]
insteadOf = git://github.com/ghc/packages/
[url "http://github.com/ghc/packages-"]
insteadOf = http://github.com/ghc/packages/
[url "https://github.com/ghc/packages-"]
insteadOf = https://github.com/ghc/packages/
[url "ssh://[email protected]/ghc/packages-"]
insteadOf = ssh://[email protected]/ghc/packages/
[url "[email protected]:/ghc/packages-"]
insteadOf = [email protected]:/ghc/packages/
[fetch]
prune = true
[pull]
ff = only
[tag]
sort = version:refname
[init]
defaultBranch = main
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true