gitignore: update

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index b6e5f634328a4ff4715d4d60cb5dcc55dbaf1118..1819dca38f43a75279b876053e61fa007b47a634 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,6 +2,8 @@
        name = Mike Frysinger
        email = vapier@gentoo.org
 #      signingkey = 0xE837F581
+[core]
+       abbrev = 12
 [color]
        ui = auto
        diff = auto
@@ -20,6 +22,8 @@
 [alias]
        a    = add
        ab   = abandon
+       am-a = am --abort
+       am-c = am --continue
        ar   = archive
        b    = branch -v
        bi   = bisect
@@ -57,6 +61,8 @@
        conflictstyle = diff3
 [rebase]
        autosquash = true
+[http]
+       cookiefile = ~/.gitcookies
 [transfer]
        # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
        fsckobjects = true