From ef260973339aeb044bea56aeb7cb855c57c6d012 Mon Sep 17 00:00:00 2001 From: Mari Date: Thu, 14 May 2020 13:05:30 -0400 Subject: [PATCH] Autocommitted updated scripts from mari-wovn --- per-host/mari-wovn/.bash_aliases | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/per-host/mari-wovn/.bash_aliases b/per-host/mari-wovn/.bash_aliases index 08eecc4..31431ea 100644 --- a/per-host/mari-wovn/.bash_aliases +++ b/per-host/mari-wovn/.bash_aliases @@ -55,12 +55,13 @@ function get_remote_branch_name() { function wovn_pull() { ( - cd ~/equalizer.git printf "=== Retrieving the latest data from the repository...\n" - git fetch --all || return "$?" - git rebase origin/master master || return "$?" - git rebase origin/develop develop || return "$?" - git rebase origin/develop_front develop_front || return "$?" + cd ~/branches/master || exit "$?" + git pull || exit "$?" + cd ~/branches/develop || exit "$?" + git pull || exit "$?" + cd ~/branches/develop_front || exit "$?" + git pull || exit "$?" ) }