-
Notifications
You must be signed in to change notification settings - Fork 3
Expand file tree
/
Copy pathgitconfig
More file actions
86 lines (71 loc) · 1.71 KB
/
gitconfig
File metadata and controls
86 lines (71 loc) · 1.71 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
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
[user]
name = Simon Weil
email = simon.weil@biodata.com
signingkey = 79FDA8D28453ACE1
[credential]
helper = osxkeychain
[core]
editor = /opt/homebrew/bin/nvim
excludesfile = ~/.dotfiles/gitignore_global
autocrlf = input
fsmonitor = true
[format]
signoff = true
[pull]
default = simple
[push]
default = current
[difftool]
prompt = false
[merge]
conflictStyle = zdiff3
[mergetool]
prompt = false
[diff]
algorithm = patience
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[difftool "vimdiff"]
cmd = nvim -d "$LOCAL" "$REMOTE"
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[alias]
ribbon = tag --force _ribbon origin/master
catchup = log --patch --reverse --topo-order _ribbon..origin/master
catchup-short = log _ribbon.. --oneline
catchup-summary = log _ribbon.. --summary
[pager]
diff = diff-so-fancy | less --tabs=1,5 -RFX --pattern='^(Date|added|deleted|modified): '
show = diff-so-fancy | less --tabs=1,5 -RFX --pattern='^(Date|added|deleted|modified): '
# so much color
[color]
ui = always
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "status"]
added = yellow
changed = green
untracked = cyan
[rerere]
autoupdate = true
enabled = true
[commit]
template = ~/.stCommitMsg
gpgsign = true
[help]
autocorrect = prompt
[init]
defaultBranch = master