/
.gitconfig
63 lines (63 loc) · 1.41 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
[alias]
aa = add --all
br = branch
ci = commit
co = checkout
lg = log --pretty=oneline --abbrev-commit --graph --decorate --all -10
pur = pull --rebase
ri = rebase --interactive --autosquash
report = log --pretty=format:'%h %ai %cn \n - %s'
rh = reset --hard
rv = remote -v
st = status -s -u
sync = !git pull --rebase upstream master && git push -u origin +HEAD
unstage = reset HEAD --
who = shortlog -s --
[user]
name = Eric Wendelin
email = me@eriwen.com
[core]
autocrlf = input
editor = vim -c ':normal gg'
excludesfile = ~/.gitignore
filemode = true
ignorecase = true
pager = less -R
quotepath = false
safecrlf = warn
whitespace = trailing-space,space-before-tab
[color]
ui = auto
[advice]
statusHints = false
[branch]
autosetupmerge = true
[push]
default = simple
[rerere]
enabled = 1
[merge]
stat = true
conflictstyle = diff3
tool = Kaleidoscope
[mergetool]
keepTemporaries = false
keepBackup = false
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[diff]
mnemonicprefix = true
renames = copies
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[help]
autocorrect = 1
[github]
user = eriwen
[remote "origin"]
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*