fix gpg forward GNUPGHOME reset in cleanup

[dotfiles.git] / base / .gitconfig

diff --git a/base/.gitconfig b/base/.gitconfig
index a2804ded980a8ef3d389e217325084bd27db0856..1f7f15ee8067bf4eac2f3efa93940eeed46b057d 100644 (file)
--- a/base/.gitconfig
+++ b/base/.gitconfig
@@ -5,3 +5,9 @@
 [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"
+       tree = log --oneline --graph --branches --color
+[pull]
+       ff = only
+[init]
+       defaultBranch = master