-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
53 lines (53 loc) · 1.66 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
# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
name = Jon Bramley
email = [email protected]
signingkey = 1B8E86B43B4E6C22
[web]
browser = chrome
[core]
; pager = delta
; pager = delta --features "$(defaults read -globalDomain AppleInterfaceStyle > /dev/null 2>&1 && echo dark-mode || echo light-mode)"
pager = delta $(defaults read -globalDomain AppleInterfaceStyle > /dev/null 2>&1 && echo "" || echo "--light")
excludesfile = ~/.gitignoreglobal
[interactive]
diffFilter = delta --color-only
[push]
autoSetupRemote = true
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
prompt = false
[diff]
tool = vimdiff
colorMoved = default
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
; [credential]
; UseHttpPath = true
; helper = !aws --profile txp-sandbox codecommit credential-helper $@
[credential]
helper = osxkeychain
[diff "daff-csv"]
command = daff diff --git
[merge "daff-csv"]
name = daff tabular csv merge
driver = daff merge --output %A %O %A %B
[init]
defaultBranch = main
[web "browser.chrome"]
path = /Applications/Google Chrome.app/
[commit]
gpgsign = true
[alias]
stashgrep = "!f() { for i in `git stash list --format=\"%gd\"` ; \
do git stash show -p $i | grep -H --label=\"$i\" \"$@\" ; done ; }; f"
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)