Use spaces instead of tabs in gitconfig.

Signed-off-by: Jacob Kiers <jacob@alphacomm.nl>
This commit is contained in:
Jacob Kiers 2014-03-07 10:45:49 +01:00
parent 73413fd74a
commit 921f2f5f4b

View File

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