-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
47 lines (47 loc) · 1.35 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 = Jake Chamberlain
email = [email protected]
[alias]
s = status
c = commit
cm =commit -m
incoming = !(git fetch --quiet && git log --pretty=format:'%C(yellow)%h %C(white)- %C(red)%an %C(white)- %C(cyan)%d%Creset %s %C(white)- %ar%Creset' ..@{u})
outgoing = !(git fetch --quiet && git log --pretty=format:'%C(yellow)%h %C(white)- %C(red)%an %C(white)- %C(cyan)%d%Creset %s %C(white)- %ar%Creset' @{u}..)
unstage = reset HEAD
history = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
upstream = branch --set-upstream-to
cleanup = !git remote prune origin && git gc && git clean -df && git stash clear
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[mergetool]
keepBackup = false
[core]
excludesfile = /Users/Jake/.gitignore
[push]
default = matching
[pull]
default = matching
[github]
user = jchamb
[color]
ui = auto
branch = auto
diff = auto
interactive = auto
status = auto
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[credential]
helper = osxkeychain