65 lines
1.4 KiB
Text
65 lines
1.4 KiB
Text
[user]
|
|
name = Eryn Wells
|
|
email = eryn@erynwells.me
|
|
[core]
|
|
editor = vim
|
|
quotepath = false
|
|
[color]
|
|
ui = auto
|
|
[merge]
|
|
tool = Kaleidoscope
|
|
[alias]
|
|
# Commits
|
|
c = commit
|
|
cm = commit -m
|
|
ca = commit -a
|
|
cam = commit -am
|
|
# Amended commits
|
|
cn = commit --amend
|
|
cna = commit --amend -a
|
|
cnam = commit --amend -am
|
|
|
|
# Status, diffs
|
|
s = status
|
|
l = log
|
|
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
|
|
d = diff
|
|
dc = diff --cached
|
|
dt = difftool
|
|
|
|
# Branches, etc
|
|
b = branch
|
|
co = checkout
|
|
cob = checkout -b
|
|
|
|
# Merges and rebases
|
|
m = merge
|
|
mt = mergetool
|
|
rb = rebase
|
|
rbi = rebase --interactive
|
|
|
|
# Resets, moving HEAD
|
|
r = reset
|
|
r1 = reset HEAD^
|
|
r2 = reset HEAD^^
|
|
rh = reset --hard
|
|
rh1 = reset --hard HEAD^
|
|
rh2 = reset --hard HEAD^^
|
|
|
|
# Remotes
|
|
p = push -u
|
|
f = fetch
|
|
[ui]
|
|
color = true
|
|
[diff]
|
|
tool = Kaleidoscope
|
|
[mergetool]
|
|
keepBackup = true
|
|
prompt = false
|
|
[difftool]
|
|
prompt = false
|
|
[difftool "Kaleidoscope"]
|
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
|
[mergetool "Kaleidoscope"]
|
|
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
|
trustExitCode = true
|