-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
47 lines (47 loc) · 1.13 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
[push]
default = simple
autoSetupRemote = true
[pull]
rebase = false
[user]
name = Luke Aiken
email = [email protected]
[core]
excludesfile = /Users/lukeaiken/.gitignore_global
safecrlf = true
editor = /opt/homebrew/bin/vim
autocrlf = false
[alias]
hist = log --pretty=format:\"%C(magenta bold)%h%Creset %C(green)%ad%Creset %C(yellow)%d%s%Creset [%C(cyan)%an%Creset]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
ctags = !.git/hooks/ctags
[color]
ui = true
[merge]
tool = diffconflicts
[credential]
helper = osxkeychain
[diff]
tool = vimdiff
[init]
templatedir = ~/.git_template
defaultBranch = master
[mergetool "diffconflicts"]
keepBackup = false
cmd = vim -c DiffConflicts \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[url "https://"]
insteadOf = git://
[mergetool]
keepBackup = false
[rebase]
autosquash = true
[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
[submodule]
recurse = true