gnupg: add dirmngr.conf

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 4be988b20d40096d904fc1f09020fbf79be45675..1819dca38f43a75279b876053e61fa007b47a634 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,6 +22,8 @@
 [alias]
        a    = add
        ab   = abandon
+       am-a = am --abort
+       am-c = am --continue
        ar   = archive
        b    = branch -v
        bi   = bisect
@@ -59,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