gitignore: update

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index a45d134b0b779578ebf070600f359fc3291d2dcc..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
@@ -19,6 +22,8 @@
 [alias]
        a    = add
        ab   = abandon
+       am-a = am --abort
+       am-c = am --continue
        ar   = archive
        b    = branch -v
        bi   = bisect
@@ -56,6 +61,11 @@
        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