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
[alias]
a = add
- ab = abandon
am-a = am --abort
am-c = am --continue
ar = archive
cp-x = cherry-pick -x
d = diff
desc = describe
- dl = download
f = fetch
fp = format-patch -C -M
g = grep
h = help
l = log
lf = log --format= --name-only
- m = merge --log=50 --no-stat
+ m = merge --log=100 --no-stat
rb = rebase
rb-d = rebase --committer-date-is-author-date
rb-a = rebase --abort
sm = submodule
st = status
t = tag
- up = upload
[tag]
sort = version:refname
# 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
suppressfrom = true
suppresscc = author
smtpserver = localhost:1111
+ transferEncoding = 8bit
+# composeencoding = utf-8
+ assume8bitEncoding = 8bit