-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
47 lines (44 loc) · 1.23 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
[user]
name = nine9ths
email = [email protected]
[includeIf "gitdir:~/Work/"]
path = ~/.workgitconfig
[alias]
co = checkout
ci = commit
stat = status
viz = !git log --graph --all --decorate --oneline --date-order --color $* | tail -r | tr '\\\\/' '/\\\\' && :
wdiff = diff --color-words='[^[:space:]]|.'
diffdir = difftool --dir-diff --tool=oxygendirs
wxdiff = diff --word-diff-regex='[^[:space:]]|(<[^>]*>)|([[:alnum:]]+=>[^<]*<)'
[push]
default = simple
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[core]
excludesfile = ~/.gitignore
autocrlf = false
[diff "hex"]
textconv = hexdump -v -C
binary = true
[diff]
tool = oxygendiff
[merge]
tool = oxygendiff
[difftool "oxygendiff"]
cmd = sh '/Applications/Oxygen XML Editor/diffFiles.sh' -ext $REMOTE $LOCAL $LOCAL
[mergetool "oxygendiff"]
cmd = sh '/Applications/Oxygen XML Editor/diffFiles.sh' -ext $LOCAL $REMOTE $BASE $MERGED
trustExitCode = true
[difftool "oxygendirs"]
cmd = sh '/Applications/Oxygen XML Editor/diffDirs.sh' $LOCAL $REMOTE
trustExitCode = true
[difftool]
prompt = false
[init]
defaultBranch = main
[svn]
# push empty directory removals back to svn as directory deletes
rmdir = true