forked from francois-pasquier/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathdot_gitconfig
More file actions
43 lines (32 loc) · 790 Bytes
/
dot_gitconfig
File metadata and controls
43 lines (32 loc) · 790 Bytes
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
[user]
name = Maxime Leherquer
email = m.leherquer-ext@genybet.fr
[include]
path = .gitalias
[credential]
helper = osxkeychain
[commit]
gpgSign = false
template = /Users/max/.stCommitMsg
[core]
pager = delta
excludesfile = /Users/max/.gitignore_global
[diff]
colorMoved = default
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
side-by-side = true
[merge]
conflictstyle = zdiff3
[push]
autoSetupRemote = true
[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