forked from mathiasbynens/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
80 lines (65 loc) · 1.46 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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
[hub]
protocol = https
[include]
path = /Users/franco/src/dotfiles/.gitconfig
[credential]
helper = osxkeychain
[core]
pager = less -FRSX
[push]
default = matching
[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
[user]
name = Franco Sebregondi
email = me@usershell.org
[alias]
s = status
st = status
co = checkout
b = branch
c = commit
comit = commit
l = log --stat
d = diff
p = cherry-pick -n
unstage = reset HEAD
amend = commit --amend
r = rebase -i
lg = "log --color --graph --pretty=format:'%C(auto)%h%d %s %C(#555555)(%cr) %C(bold blue)<%aN>%Creset' --abbrev-commit"
lgp = log --graph --oneline --decorate --first-parent
sl = log --oneline
diffc = diff --cached
[color]
ui = true
[svn]
rmdir = true
[init]
templatedir = ~/.git_template
[github]
user = franco
; [http]
; sslCAInfo = ~/src/cargo/webapp/config/CargoServer+DC+CA.crt
[merge]
tool = p4merge
[mergetool]
prompt = false
[diff]
tool = kitty
guitool = kitty.gui
[difftool]
prompt = false
trustExitCode = true
[difftool "kitty"]
cmd = kitty +kitten diff $LOCAL $REMOTE
[difftool "kitty.gui"]
cmd = kitty kitty +kitten diff $LOCAL $REMOTE
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true