dotfiles/tilde/gitconfig

83 lines
2.0 KiB
Plaintext
Raw Normal View History

2012-10-10 12:51:59 +00:00
[color]
ui = auto
2012-10-10 12:51:59 +00:00
[color "diff"]
meta = blue
frag = white
old = red bold
new = green bold
[help]
autocorrect = 1
2012-10-10 12:51:59 +00:00
[core]
# Force vim in foreground mode.
editor = vim -f
# http://stackoverflow.com/questions/136178/git-diff-handling-long-lines
# If doesn't work, try: pager = less -+$LESS -FRX
pager = less -r
autocrlf = false
safecrlf = false
mergeoptions = --no-edit
excludesfile = ~/.gitignore
2012-10-10 12:51:59 +00:00
[alias]
a = add
ua = reset HEAD
b = branch
c = commit --verbose
ca = commit -a --verbose
cm = commit -m --verbose
cam = commit -am --verbose
co = checkout
d = diff --color-words
s = status -sb
l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
ll = log --stat --abbrev-commit
conflicts = diff --name-only --diff-filter=U
commerge = commit --no-edit
2012-10-10 12:51:59 +00:00
[push]
default = upstream
2012-10-10 12:51:59 +00:00
# Any GitHub repo with my username should be checked out r/w by default
# http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules
[url "git@github.com:jacobkiers/"]
insteadOf = "git://github.com/jacobkiers/"
2012-10-10 12:51:59 +00:00
# URL shorthands
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
2012-10-10 12:51:59 +00:00
[url "git://github.com/"]
insteadOf = "github:"
2012-10-10 12:51:59 +00:00
[url "git@gist.github.com:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
2012-10-10 12:51:59 +00:00
[url "git://gist.github.com/"]
insteadOf = "gist:"
2012-10-10 12:51:59 +00:00
[url "git@git.courtesycall.nl:"]
insteadOf = "gc:"
2013-02-24 19:24:42 +00:00
# DiffMerge
[merge]
tool = diffmerge
2013-02-24 19:24:42 +00:00
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = true
2013-02-24 19:24:42 +00:00
[diff]
tool = diffmerge
2013-02-24 19:24:42 +00:00
[difftool "diffmerge"]
cmd = diffmerge $LOCAL $REMOTE
2013-02-24 19:24:42 +00:00
2012-10-10 12:51:59 +00:00
# Include local settings
# Requires Git 1.7.10
# git config -f ~/.gitlocal user.email "jacob@jacobkiers.net"
# git config -f ~/.gitlocal user.name "Jacob Kiers"
2012-10-10 12:51:59 +00:00
[include]
path = .gitlocal
[fetch]
prune = true