X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=61f69994a51fa3033adfeaee13aba1c2b83cccf3;hb=6ba00e98257c3777c63600b1af5356d5fb73f881;hp=b3201a925db28b5845bf0ac0c97440dbb6ded26a;hpb=a78ac12120c3d7f88e53e5418f36d3b2f8c65a93;p=home.git diff --git a/.gitconfig b/.gitconfig index b3201a9..61f6999 100644 --- a/.gitconfig +++ b/.gitconfig @@ -28,10 +28,10 @@ skip-ensure-authenticated = true squash-uploads = false -#[pager] -# diff = diff-highlight | less -# log = diff-highlight | less -# show = diff-highlight | less +[pager] + diff = diff-highlight | less + log = diff-highlight | less + show = diff-highlight | less [protocol] # https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html @@ -91,6 +91,9 @@ # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0 fsckobjects = true +[init] + defaultBranch = main + [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /usr/bin/git-merge-changelog %O %A %B @@ -101,3 +104,6 @@ suppressfrom = true suppresscc = author smtpserver = localhost:1111 + transferEncoding = 8bit +# composeencoding = utf-8 + assume8bitEncoding = 8bit