X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=d5535a102d2c0301c94cfb601bf39b770bcbd437;hb=86c6f81d3b7c0b192549c1b285262597c100b22e;hp=c16415a947a8760147054b0b1f3e3bbecfabbcf0;hpb=05e692f3b0ac9a58cd7755fb0b6a343085ad17c9;p=dotfiles.git diff --git a/.gitconfig b/.gitconfig index c16415a..d5535a1 100644 --- a/.gitconfig +++ b/.gitconfig @@ -20,7 +20,10 @@ stb = status --short --branch unstage = reset HEAD -- wdiff = diff --word-diff - wshow = show --word-diff + wshow = show --word-diff --decorate + +[branch] + autosetuprebase = always [color] ui = auto @@ -88,6 +91,9 @@ [core] pager = less -FRSXgimq +[log] + abbrevCommit = true + [merge] tool = vimdiff