update zsh, X, gpg config; add ssh config, gpg bin

[dotfiles.git] / base / .gitconfig

diff --git a/base/.gitconfig b/base/.gitconfig
index f20bd0274bec1ea31f9e133b0e610bd3f96dae11..8d0cd8fc723709cc5f561f066c611b9a442ccf32 100644 (file)
--- a/base/.gitconfig
+++ b/base/.gitconfig
@@ -1,7 +1,12 @@
 [user]
 [user]

-       email = git@ds6.pw
-       name = ds6
+       email = git@sev.monster
+       name = sev

 
 [alias]
        push-all = !git remote | xargs -n1 git push
        submodules-pull = submodule foreach git pull origin master
 
 [alias]
        push-all = !git remote | xargs -n1 git push
        submodules-pull = submodule foreach git pull origin master

+       pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+[pull]
+       ff = only
+[init]
+       defaultBranch = master