You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
128 lines
3.1 KiB
128 lines
3.1 KiB
[user]
|
|
name = Jonathan "Duke" Leto
|
|
email = <jonathan@leto.net>
|
|
editor = vim
|
|
|
|
[alias]
|
|
# this assumes that we want to push HEAD to a remote called origin (usually an upstream repo)
|
|
# as well as a remote called "leto" (usually my fork of something)
|
|
spread = !git push --tags origin HEAD && git push --tags leto HEAD
|
|
|
|
disregard = update-index --assume-unchanged
|
|
regard = update-index --no-assume-unchanged
|
|
|
|
a = add
|
|
addp = add --patch
|
|
axe = !sh -c 'git log -p -S"$0"'
|
|
back = checkout -
|
|
b = branch
|
|
c = commit
|
|
co = checkout
|
|
clone-shallow = clone --depth 5
|
|
cudgel = clean -fdx
|
|
detach = checkout @{0}
|
|
delete = !sh -c 'git push "$0" :refs/heads/"$1"' # delete remote branch with git delete foo
|
|
faster = repack -a -d -f --window=200 --window-memory=1g
|
|
f = fetch
|
|
flog = reflog
|
|
fold = merge --no-ff
|
|
hist = log --pretty=format:'%C(yellow)%h%Creset %s %Cred%an%Creset %Cblue%d%Creset %Cgreen%cr%Creset %cd' --graph --all
|
|
h = log --pretty=format:'%C(yellow)%h%Creset %s %Cred%an%Creset %Cblue%d%Creset %Cgreen%cr%Creset %cd' --graph --all
|
|
last = cat-file commit HEAD
|
|
lp = log -p
|
|
pick = cherry-pick
|
|
p = push
|
|
praise = blame
|
|
pr = pull --rebase
|
|
pu = push
|
|
pus = push
|
|
r = remote
|
|
sha1 = rev-parse
|
|
s = status
|
|
staged = diff --cached
|
|
up = !git stash && git pull --rebase origin master && git stash pop
|
|
unstage= reset HEAD --
|
|
v = !git --version
|
|
who = shortlog -se --
|
|
wip = stash
|
|
sync = commit -am "sync"
|
|
|
|
lazyrebase = !git stash && git pull --rebase && git stash pop
|
|
unmerged = branch --no-merged
|
|
|
|
pull-all-submodules = submodule foreach "git checkout master && git pull origin master"
|
|
stash-all = stash save --include-untracked
|
|
|
|
[core]
|
|
excludesfile = ~/.gitignore_global
|
|
editor = vim
|
|
pager = less -FXRS
|
|
filemode = true
|
|
logallrefupdates = true
|
|
autocrlf = false
|
|
whitespace = trailing-space,space-before-tab,cr-at-eol
|
|
# enable if you are on NFS
|
|
#preloadindex = true
|
|
|
|
[log]
|
|
date = local
|
|
|
|
# This Does Bad Things
|
|
[apply]
|
|
# whitespace = strip
|
|
|
|
[diff]
|
|
rename = copy
|
|
algorithm = patience
|
|
|
|
[diff "ruby"]
|
|
funcname="^ *\\(\\(class\\|module\\|def\\) .*\\)"
|
|
|
|
[color]
|
|
ui = auto
|
|
diff = auto
|
|
branch = auto
|
|
status = auto
|
|
|
|
[color "diff"]
|
|
meta = yellow
|
|
frag = cyan
|
|
old = red bold
|
|
new = green bold
|
|
whitespace = red reverse
|
|
|
|
[color "status"]
|
|
added = yellow
|
|
changed = green
|
|
untracked = cyan
|
|
|
|
[push]
|
|
default = current
|
|
|
|
[rerere]
|
|
enabled = 1
|
|
|
|
[sendemail]
|
|
smtpserver = smtp.gmail.com
|
|
smtpuser = jaleto@gmail.com
|
|
smtpencryption = tls
|
|
smtpserverport = 587
|
|
|
|
[help]
|
|
autocorrect = 10
|
|
|
|
[rebase]
|
|
stat = 1
|
|
[github]
|
|
user = leto
|
|
[merge]
|
|
conflictstyle = diff3
|
|
[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
|
|
|
|
[transfer]
|
|
fsckobjects = true
|
|
|