[user]
name = Mike Frysinger
email = vapier@gentoo.org
+# signingkey = 0xE837F581
+
+[core]
+ abbrev = 12
+ pager = less -FRMX --tabs 4 -#10
+
[color]
ui = auto
diff = auto
status = auto
+
[color "diff"]
old = red bold
new = green bold
frag = yellow bold
whitespace = normal green
meta = magenta
+
+[diff]
+ renames = true
+
+# Settings used by Chromium's `git cl`. The defaults are brain-dead.
+[gerrit]
+ skip-ensure-authenticated = true
+ squash-uploads = false
+
+[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
+ version = 2
+
[push]
default = current
+
[alias]
a = add
- ab = abandon
+ am-a = am --abort
+ am-c = am --continue
ar = archive
b = branch -v
bi = bisect
cp-x = cherry-pick -x
d = diff
desc = describe
- dl = download
f = fetch
fp = format-patch -C -M
g = grep
h = help
l = log
- m = merge
- rb = rebase --committer-date-is-author-date
+ lf = log --format= --name-only
+ m = merge --log=100 --no-stat
+ rb = rebase
+ rb-d = rebase --committer-date-is-author-date
rb-a = rebase --abort
rb-c = rebase --continue
rb-i = rebase --interactive
sm = submodule
st = status
t = tag
- up = upload
+
+[tag]
+ sort = version:refname
+
[merge]
conflictstyle = diff3
+
[rebase]
autosquash = true
+
+[http]
+ cookiefile = ~/.gitcookies
+
+[transfer]
+ # 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
+
[sendemail]
chainreplyto = false
confirm = always
suppressfrom = true
+ suppresscc = author
smtpserver = localhost:1111
+ transferEncoding = 8bit
+# composeencoding = utf-8
+ assume8bitEncoding = 8bit