-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy path.gitconfig
53 lines (53 loc) · 1.37 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
[user]
name = 🖖 Randall Hunt 🖖
email = randallhunt@gmail.com
[core]
editor = vim
whitespace = fix,trailing-space,space-before-tab,tab-in-indent
excludesfile = /Users/ranman/.gitignore
pager = git-split-diffs --color | less -RFX
[github]
user = ranman
[hub]
http-clone = false
[rerere]
enabled = 1
[color]
ui = true
interactive = true
[push]
default = current
[branch]
autosetuprebase = always
[alias]
co = checkout
pull = pull --ff-only
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
st = status -sb
conflicts = git diff --diff-filter=U
karma = shortlog -sn
[help]
autocorrect = 1
[diff]
algorithm = patience
[credential]
helper = osxkeychain
[init]
defaultBranch = main
[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