X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=b3e81d7b57c30205123d0c285b47ee2d2843e0ac;hb=56329756fa00ef4e8c609b898192eb188419e8d5;hp=c16415a947a8760147054b0b1f3e3bbecfabbcf0;hpb=05e692f3b0ac9a58cd7755fb0b6a343085ad17c9;p=dotfiles.git diff --git a/.gitconfig b/.gitconfig index c16415a..b3e81d7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -22,6 +22,9 @@ wdiff = diff --word-diff wshow = show --word-diff +[branch] + autosetuprebase = always + [color] ui = auto @@ -88,6 +91,9 @@ [core] pager = less -FRSXgimq +[log] + abbrevCommit = true + [merge] tool = vimdiff