X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=d5535a102d2c0301c94cfb601bf39b770bcbd437;hb=56526d608e013e5cac3488b66c6bf5f267357667;hp=66a284234459b24f18c87522514305651b27339f;hpb=6a0e2cd17c1ee99bc8a508ba138332c4a2edae66;p=dotfiles.git diff --git a/.gitconfig b/.gitconfig index 66a2842..d5535a1 100644 --- a/.gitconfig +++ b/.gitconfig @@ -20,7 +20,7 @@ stb = status --short --branch unstage = reset HEAD -- wdiff = diff --word-diff - wshow = show --word-diff + wshow = show --word-diff --decorate [branch] autosetuprebase = always @@ -91,6 +91,9 @@ [core] pager = less -FRSXgimq +[log] + abbrevCommit = true + [merge] tool = vimdiff