-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
65 lines (65 loc) · 1.71 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
[user]
name = Boerger, Chris
email = [email protected]
[core]
excludesfile = /Users/chrisb/.gitignore_global
editor = nvim
[push]
default = simple
[alias]
au = "!git for-each-ref --format='%(color:cyan)%(authorname)%(color:reset)_,,,_%(color:yellow)%(committerdate)%(color:reset)_,,,_%(refname)' | sort -k1 -k2 | awk 'BEGIN {FS=\"_,,,_\"}; {printf \"%-30s %-40s %s\\n\", $1, $2, $3}'"
bl = blame
br = branch
ci = commit
cia = commit --amend
co = checkout
delloc = branch -d --
delrem = push origin --delete --
dt = difftool
fe = fetch -p
last = log -1 HEAD
lg = log --graph --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(blue)<%an>%C(reset)' --abbrev-commit --date=relative
mt = mergetool
pl = pull
plr = pull --rebase
pu = push
re = restore
sh = stash -u
shbr = stash branch
shdel = stash drop
shin = stash apply --index
shli = stash list
st = status
uncommit = reset HEAD --
unci = reset HEAD --
undo = checkout --
conflicted = !nvim +Conflicted
[credential]
helper = osxkeychain
[transfer]
fsckobjects = true
[fetch]
fsckobjects = true
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
keepBackup = false
[commit]
template = /Users/chrisb/.stCommitMsg
[pager]
branch = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"