From a9618a0fd3823e149c1e9561e392f93bdf32559c Mon Sep 17 00:00:00 2001 From: Eric Nielsen Date: Tue, 25 Jul 2017 08:28:42 -0500 Subject: [PATCH] [git] Use fetch --all in gfu alias instead of `remote update`. Both behave the same way, fetching from all configured remotes. The `fetch --all` is shorter, and probably more familiar. See https://stackoverflow.com/a/17512004/2654518 Also change `;` to `&&`, so merge is only called after fetch succeeded. Closes #196 --- modules/git/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/git/init.zsh b/modules/git/init.zsh index 5db91df..48d0f48 100644 --- a/modules/git/init.zsh +++ b/modules/git/init.zsh @@ -71,7 +71,7 @@ alias gf='git fetch' alias gfc='git clone' alias gfm='git pull' alias gfr='git pull --rebase' -alias gfu='git remote update --prune; git merge --ff-only @\{u\}' +alias gfu='git fetch --all --prune && git merge --ff-only @\{u\}' # Grep (g) alias gg='git grep'