-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
59 lines (49 loc) · 1.39 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
[user]
name = Bernhard Mallinger
email = [email protected]
[diff "sqlite"]
textconv = sqlite3dump
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
[push]
default = simple
[diff]
noprefix = true
# external = difft --background light --display inline
colorMoved = default
[delta]
line-numbers = true
navigate = true # use n and N to move between diff sections
hyperlinks = true
# this file link format doesn't work, but at least it doesn't
# open a weird editor. would need to set it up to open a terminal
# with nvim
# https://dandavison.github.io/delta/grep.html#grep
hyperlinks-file-link-format = "file://{path}:{line}"
[rebase]
autosquash = true
[core]
editor = nvim
pager = delta
[init]
defaultBranch = main
[gui]
recentrepo = /home/totycro/git/git-test
[diff "jupyternotebook"]
command = git-nbdiffdriver diff
[merge "jupyternotebook"]
driver = git-nbmergedriver merge %O %A %B %L %P
name = jupyter notebook merge driver
[difftool "nbdime"]
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
# [difftool] prompt = false
[mergetool "nbdime"]
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
prompt = false
[pull]
rebase = true
[merge]
conflictstyle = diff3
[branch]
sort = committerdate