add apkv, explicitly source XDG dirs in zshenv

[dotfiles.git] / base / .gitconfig

diff --git a/base/.gitconfig b/base/.gitconfig
index a2804ded980a8ef3d389e217325084bd27db0856..8d0cd8fc723709cc5f561f066c611b9a442ccf32 100644 (file)
--- a/base/.gitconfig
+++ b/base/.gitconfig
@@ -5,3 +5,8 @@
 [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