-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
46 lines (42 loc) · 1.06 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
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
[receive]
denyCurrentBranch = updateInstead
[alias]
history = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --branches --date-order
pushall = !git remote | xargs -L1 git push --all
forcepostreceive = !git commit --amend --no-edit && git push -f live
[gpg]
program = gpg2
[credential]
helper = cache
[core]
editor = subl -n -w
excludesfile = /Users/timothy/.gitignore_global
[protocol]
version = 2
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[user]
name = beyondmeh
email = me@beyondmeh.com
[mergetool "smerge"]
cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
[mergetool]
keepBackup = false
[merge]
tool = smerge
[difftool "smerge"]
cmd = smerge \"$BASE\" \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = smerge