-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
57 lines (45 loc) · 1.31 KB
/
Copy path.gitconfig
File metadata and controls
57 lines (45 loc) · 1.31 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
[user]
name = Marvin Dore
email = hi@marvindore.com
[core]
pager = delta
longpaths = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
dark = true # or light = true, or omit for auto-detection
hyperlinks = true
[merge]
tool = nvim
conflictstyle = diff3
[mergetool "nvim"]
cmd = nvim -f -c \"DiffviewOpen\"
conflictstyle = diff3
keepBackup = false
prompt = false
[alias]
# Difftastic aliases, so `git dlog` is `git log` with difftastic and so on.
dl = -c diff.external=difft log --ext-diff
ds = -c diff.external=difft show --ext-diff
dd = -c diff.external=difft diff
dlp = -c diff.external=difft log -p --ext-diff
mergetool = "!nvim -c DiffviewOpen"
dm = "!nvim -c DiffviewOpen && git add . && echo \"Conflicts resolved. Ready to commit.\""
[difftool]
difftool = true
prompt = false
[pager]
difftool = true
[diff]
# Set difftastic as the default difftool, so we don't need to specify
# `-t difftastic` every time.
tool = difftastic
[difftool "difftastic"]
prompt = false
cmd = difft "$LOCAL" "$REMOTE"
# User different gitconfig based on directory
[includeIf "gitdir:~/work/"]
path = .gitconfig-work
[includeIf "gitdir:C:/"]
path = .gitconfig-work