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

[dotfiles.git] / base / .gitconfig

diff --git a/base/.gitconfig b/base/.gitconfig
index 5ed2164e109f1473df105298d4f4e1ee9f02f179..8d0cd8fc723709cc5f561f066c611b9a442ccf32 100644 (file)
--- a/base/.gitconfig
+++ b/base/.gitconfig
@@ -8,3 +8,5 @@
        pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
 [pull]
        ff = only
+[init]
+       defaultBranch = master