Merge remote-tracking branch 'upstream/master'

This commit is contained in:
linsilence 2019-07-03 11:59:34 +08:00
commit 1b8f377d41
2 changed files with 2 additions and 2 deletions

View file

@ -33,7 +33,7 @@ Oh My Zsh is an open source, community-driven framework for managing your [zsh](
Sounds boring. Let's try again.
__Oh My Zsh will not make you a 10x developer...but you might feel like one.__
__Oh My Zsh will not make you a 10x developer...but you may feel like one.__
Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_

View file

@ -5,7 +5,7 @@ function git-fetch-all {
dir=`git rev-parse --git-dir` &&
[[ ! -f $dir/NO_AUTO_FETCH ]] &&
(( `date +%s` - `date -r $dir/FETCH_LOG +%s 2>/dev/null || echo 0` > $GIT_AUTO_FETCH_INTERVAL )) &&
git fetch --all &>! $dir/FETCH_LOG &)
git fetch --all 2>/dev/null &>! $dir/FETCH_LOG &)
}
function git-auto-fetch {