102 lines
2.4 KiB
Plaintext
102 lines
2.4 KiB
Plaintext
[color]
|
|
ui = auto
|
|
|
|
[color "diff"]
|
|
meta = blue
|
|
frag = white
|
|
old = red bold
|
|
new = green bold
|
|
|
|
[help]
|
|
autocorrect = 1
|
|
|
|
[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 = diff-highlight | less -RFX
|
|
# pager = less -r
|
|
autocrlf = false
|
|
safecrlf = false
|
|
mergeoptions = --no-edit
|
|
excludesfile = ~/.gitignore
|
|
|
|
[alias]
|
|
a = add
|
|
ap = add --patch
|
|
b = branch
|
|
c = commit --verbose --signoff
|
|
cm = commit --verbose --signoff --message
|
|
co = checkout
|
|
d = diff
|
|
ds = diff --staged
|
|
l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
|
|
ll = log --stat --abbrev-commit
|
|
r = rebase
|
|
s = status --short --branch
|
|
ua = reset HEAD
|
|
commerge = commit --no-edit
|
|
conflicts = diff --name-only --diff-filter=U
|
|
[push]
|
|
default = upstream
|
|
|
|
# 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/"
|
|
|
|
[url "git@bitbucket.org:jacobkiers/"]
|
|
insteadOf = "https://bitbucket.org/jacobkiers/"
|
|
|
|
# URL shorthands
|
|
|
|
[url "git@bitbucket.org:"]
|
|
insteadOf = "bb:"
|
|
[url "git@github.com:"]
|
|
insteadOf = "gh:"
|
|
pushInsteadOf = "github:"
|
|
pushInsteadOf = "git://github.com/"
|
|
[url "git://github.com/"]
|
|
insteadOf = "github:"
|
|
[url "git@gist.github.com:"]
|
|
insteadOf = "gst:"
|
|
pushInsteadOf = "gist:"
|
|
pushInsteadOf = "git://gist.github.com/"
|
|
[url "git://gist.github.com/"]
|
|
insteadOf = "gist:"
|
|
|
|
[url "git@git.courtesycall.nl:"]
|
|
insteadOf = "gc:"
|
|
|
|
# DiffMerge
|
|
[merge]
|
|
ff = no
|
|
commit = no
|
|
tool = diffmerge
|
|
[mergetool "diffmerge"]
|
|
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
|
|
trustExitCode = true
|
|
[diff]
|
|
algorithm = minimal
|
|
compationHeuristic = true
|
|
renames = true
|
|
tool = diffmerge
|
|
[difftool "diffmerge"]
|
|
cmd = diffmerge $LOCAL $REMOTE
|
|
|
|
# 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"
|
|
[include]
|
|
path = .gitlocal
|
|
|
|
[fetch]
|
|
prune = true
|
|
|
|
[init]
|
|
templatedir = ~/dotfiles/resources/git-template
|
|
[pull]
|
|
ff = yes
|