mirror of
https://github.com/tomru/DotfilesOld.git
synced 2026-03-03 14:37:25 +01:00
26 lines
588 B
Plaintext
26 lines
588 B
Plaintext
[user]
|
|
name = Thomas Ruoff
|
|
email = thomasr@brandwatch.com
|
|
[color]
|
|
branch = auto
|
|
diff = auto
|
|
interactive = auto
|
|
status = auto
|
|
[core]
|
|
autocrlf = input
|
|
[alias]
|
|
st = status
|
|
co = checkout
|
|
cm = commit
|
|
br = branch
|
|
llog = log --date=local
|
|
changes = diff --name-status -r
|
|
diffstat = diff --stat -r
|
|
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
|
|
[merge]
|
|
tool = bc3
|
|
[mergetool]
|
|
cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
|
|
[push]
|
|
default = current
|