+git: checkout: +--ignore-other-worktrees

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 5bd3546..2bd97fb 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -215,6 +215,7 @@ export PYTHONUNBUFFERED=1
 export ASAN_OPTIONS=detect_leaks=0
 export GTK_OVERLAY_SCROLLING=0
 export MAKEFLAGS=
+export DEBUGINFOD_URLS=
 cpus="`getconf _NPROCESSORS_ONLN`"
 if [ -n "$cpus" ];then
        # *3/2 was OOM for host1 32 CPUs + 16GB RAM
@@ -287,7 +288,7 @@ function ctags {(unset ctags
                                                -o -name "*.[chCy]" \
                                                -o -name "*.cc"    \
                                                -o -name "*.cxx"   \
-                                               -o -name "*.cpp"   \
+                                               -o -name "*.[ch]pp"   \
                                                -o -name "*.[Ss]"  \
                                                -o -name "*.java"  \
                                                -o -name "*.p[lm]" \
@@ -393,6 +394,7 @@ function rpmsrclist
 }
 function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
 function gitcommit { git commit -a --allow-empty-message -m '' "$@"; }
+function git {(unset git;if [ "$1" = "checkout" ];then shift;git checkout --ignore-other-worktrees "$@";else git "$@";fi)}
 function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"; );}
 function swap() {( set -ex;local TMPFILE=tmp.$$;[ $# = 2 ] && mv "$1" $TMPFILE && mv "$2" "$1" && mv $TMPFILE "$2" && echo done )}
 alias gthumb='rm -rf ~/.cache/thumbnails/fail/;gthumb'