-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy path.gitconfig
114 lines (114 loc) · 3.25 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
[user]
name = Klas Mellbourn
signingkey = 9421003411C7A828
email = [email protected]
[include]
path = .gitconfig.aliases
[include]
path = .gitconfig.pager
[include]
path = .gitconfig.user.foss
[include]
path = .gitconfig.credentials
[includeIf "gitdir:~/code/klarna/"]
path = .gitconfig.user
[includeIf "gitdir:~/Klarna/"]
path = .gitconfig.user
[includeIf "gitdir:~/code/klarna/ui/"]
path = .gitconfig.user.foss
[includeIf "gitdir:~/code/klarna/bubble-ui/"]
path = .gitconfig.user.foss
# redundant, but don't forget this repo
[includeIf "gitdir:~/.yadm/"]
path = .gitconfig.user.foss
[init]
defaultBranch = main
[core]
fsmonitor = true # KLA, not handled by yadm, this MUST be set to false manually in ~/.local/share/yadm/repo.git/config
# for this to work, hat mtime is working properly on your system
untrackedCache = true # KLA
[help]
autocorrect = 0 # KLA preferred prompt, but tough
[pack]
useSparse = true # this is default
[checkout]
workers = 0
[commit]
gpgsign = true
[mergetool]
keepbackup = false
prompt = false
trustExitCode = true
[difftool]
prompt = false
[diff]
algorithm = histogram
# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject instead of a/b/c/d as prefixes for patches
mnemonicPrefix = true
tool = vimdiff
colorMoved = default
submodule = log
[merge]
tool = vimdiff
# Include summaries of merged commits in newly created merge commit messages
log = true
conflictStyle = diff3 # KLA prefered zdiff3
[status]
submodulesummary = true
[commit]
verbose = 2
[fetch]
prune = true
[log]
decorate = short
abbrevcommit = true
date = relative
[rerere]
enabled = true
[pull]
rebase = true
[push]
autoSetupRemote = true
default = current # KLA
[rebase]
autoStash = true
autoSquash = true
[format]
pretty = "%C(yellow)%h %C(magenta)%<(15,trunc)%an %C(cyan)%cd %C(auto)%d%Creset %s"
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[mergetool "vscode"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
# diff for binary Apple property list files
[diff "plist"]
textconv = plutil -convert xml1 -o -
# this will redirect all http based remote URLs to the git protocol instead, fixing auth problems at github. But causing https://stackoverflow.com/questions/58596233/failed-to-fetch-https-github-com-rust-lang-crates-io-index, but when I comment these lines out I get https://stackoverflow.com/questions/10909221/why-is-github-asking-for-username-password-when-following-the-instructions-on-sc
[url "[email protected]:"]
insteadOf = http://github.com/
insteadOf = https://github.com/
[url "https://github.com/rust-lang/crates.io-index"]
insteadOf = https://github.com/rust-lang/crates.io-index
[lfs]
locksverify = false
setlockablereadonly = false
#locksverify = false
[feature]
# enables the untracked cache. This setting assumes that mtime is working on your machine.
manyFiles = false # KLA
[include]
path = .gitconfig.modern
[include]
path = .gitconfig.old
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f