zshenv: be paranoid, try not to clobber $t var

[dotfiles.git] / etc / git / config

diff --git a/etc/git/config b/etc/git/config
index 1f7f15ee8067bf4eac2f3efa93940eeed46b057d..bcc9e4d21b9b4be72ad9314939cf98a3401fbc41 100644 (file)
--- a/etc/git/config
+++ b/etc/git/config
@@ -7,7 +7,12 @@
        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
        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
+       search = !git rev-list --all | xargs -I '{}' git ls-tree -r --full-name --format='%(objectmode) %(objecttype) %(objectname) {}%x09%(path)' '{}' | grep
+

 [init]
        defaultBranch = master
 [init]
        defaultBranch = master

+[pull]
+       ff = only
+
+[include]
+       path = config.local