gnupg: add dirmngr.conf

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 62ce442814f5dc302ed5863bd20a19ae8196b148..1819dca38f43a75279b876053e61fa007b47a634 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,9 @@
 [user]
        name = Mike Frysinger
        email = vapier@gentoo.org
+#      signingkey = 0xE837F581
+[core]
+       abbrev = 12
 [color]
        ui = auto
        diff = auto
@@ -12,11 +15,15 @@
        frag = yellow bold
        whitespace = normal green
        meta = magenta
+[diff]
+       renames = true
 [push]
        default = current
 [alias]
        a    = add
        ab   = abandon
+       am-a = am --abort
+       am-c = am --continue
        ar   = archive
        b    = branch -v
        bi   = bisect
@@ -48,10 +55,17 @@
        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
@@ -59,4 +73,5 @@
        chainreplyto = false
        confirm = always
        suppressfrom = true
+       suppresscc = author
        smtpserver = localhost:1111