forked from rtregaskis/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathgitconfig
59 lines (59 loc) · 1.63 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
54
55
56
57
58
59
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[user]
name = James Whitmarsh
email = [email protected]
[core]
excludesfile = /Users/jwhitmarsh/.gitignore_global
pager = diff-so-fancy | less --tabs=4 -RFX
askpass = /usr/libexec/git-core/git-gui--askpass
hooksPath = /Users/jwhitmarsh/.git_hooks
[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
[push]
default = simple
followTags = true
[alias]
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --pretty=format:'%Cred%h%Creset %s -%C(yellow)%d%Creset %C(dim magenta)%an%Creset' --abbrev-commit --date=format:'%b %d %H:%M'
conflicts = diff --name-only --diff-filter=U
tagdiff = "!git log --pretty=oneline --abbrev-commit $(git describe --abbrev=0 --tags $(git describe --abbrev=0)^)...$(git describe --abbrev=0)"
[color]
branch = auto
diff = auto
interactive = auto
status = auto
ui = true
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[credential]
[commit]
template = /Users/jwhitmarsh/.gitmessage
[mergetool]
keepBackup = false
[sequence]
editor = rebase-editor
[credential]
helper = cache
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newHighlight = green bold 22
newNormal = green bold
[color "diff"]
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
meta = yellow
[fetch]
prune = true
pruneTags = true