-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
67 lines (67 loc) · 1.91 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
[user]
email = tya@users.noreply.github.com
#email = ty.alexander@segment.com
name = tya
editor = vim
username = tya
[core]
whitespace = trailing-space,space-before-tab,indent-with-non-tab,cr-at-eol
autocrlf = input
excludesfile = /Users/talexander/.gitignore_global
pager = less -F -X
[init]
defaultBranch = main
[color]
diff = auto
status = auto
branch = auto
[alias]
ci = commit
co = checkout
st = status
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
lp = log -p
unmerged = !git branch -r --no-merged | grep -v HEAD | xargs -L1 git --no-pager log --pretty=tformat:'%Cgreen%d%Creset | %h | %an | %Cblue%ar%Creset' -1 | column -t -s '|'
merged = !git branch -r --merged | grep -v HEAD | xargs -L1 git --no-pager log --pretty=tformat:'%Cgreen%d%Creset | %h | %an | %Cblue%ar%Creset' -1 | column -t -s '|'
gf = fetch --all
[credential]
helper = osxkeychain
[url "ssh://git@github.com/"]
insteadOf = https://github.com/
[url "git@github.com:"]
insteadOf = https://github.com/
[url "git@code.hq.twilio.com:"]
insteadOf = https://code.hq.twilio.com/
[commit]
template = /Users/tyalexander/.git_ci_msg
[pull]
rebase = true
[push]
default = tracking
[merge]
tool = diffmerge
[mergetool]
keepBackup = false
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
trustExitCode = 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
[hub]
protocol = https
[github]
username = tya
[twilio]
username = talexander
segmentUsername = ty.alexander
segmentTeam = platform
github = tya