[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
+
+#[pager]
+# diff = diff-highlight | less
+# log = diff-highlight | less
+# show = diff-highlight | less
+
[push]
default = current
+
[alias]
a = add
- b = branch
+ ab = abandon
+ am-a = am --abort
+ am-c = am --continue
+ ar = archive
+ b = branch -v
bi = bisect
+ cfg = config
ci = commit
co = checkout
- cp = cherry-pick
+ cp = cherry-pick --ff
+ cp-a = cherry-pick --abort
+ cp-c = cherry-pick --continue
+ cp-x = cherry-pick -x
d = diff
+ desc = describe
+ dl = download
f = fetch
- fp = format-patch
+ fp = format-patch -C -M
+ g = grep
+ h = help
l = log
m = merge
rb = rebase
+ rb-d = rebase --committer-date-is-author-date
rb-a = rebase --abort
rb-c = rebase --continue
rb-i = rebase --interactive
rb-s = rebase --skip
rl = rev-list
- se = send-email
+ se = send-email -C -M
+ 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
+
+[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
-# smtpserver = zeus.spd.analog.com