-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
53 lines (53 loc) · 1.08 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 = Gil Desmarais
email = [email protected]
[core]
excludesfile = /Users/gil/.gitignore_global
autocrlf = input
attributesfile = ~/.gitattributes
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[credential]
helper = osxkeychain
[push]
default = current
[filter "media"]
clean = git media clean %f
smudge = git media smudge %f
required = true
[help]
autocorrect = 100
[color]
ui = 1
[merge]
conflictstyle = zdiff3
[alias]
showtool = "!f() { git difftool $1^ $1; }; f"
added = difftool --cached
[diff]
tool = icdiff
compactionHeuristic = true
colvorMoved = dimmed-zebra
[pager]
difftool = true
[pull]
ff = only
[http]
postBuffer = 524288000
[fetch]
prune = true
[rebase]
autosquash = true
[init]
defaultBranch = main
[commit]
gpgsign = true
[gpg]
format = ssh
[merge "merge-structure-sql"]
name = Rails structure.sql merge driver
driver = git-merge-structure-sql %A %O %B