-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
35 lines (35 loc) · 995 Bytes
/
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
[user]
name = Shawn Plummer
email = [email protected]
[github]
user = splummer
token = 75aeedf2c2ffa2009b84ec024f648c06
[core]
editor = vim
quotepath = false
excludesfile = /Users/plummer/.gitignore_global
[alias]
hist = log --graph --pretty=format:'%Cred%h%Creset %d %s %Cgreen(%cr)%Creset %Cblue[%an]%Creset' --abbrev-commit --date=relative
today = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
co = checkout
br = branch
ci = commit
st = status
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
prompt = false
[diff]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = true
[merge]
tool = Kaleidoscope
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[push]
default = simple