Fix defalut behaviour on non-tracking branches