|
|
@ -54,11 +54,14 @@ function get_remote_branch_name() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function wovn_pull() { |
|
|
|
function wovn_pull() { |
|
|
|
|
|
|
|
( |
|
|
|
|
|
|
|
cd "~/equalizer.git" |
|
|
|
printf "=== Retrieving the latest data from the repository...\n" |
|
|
|
printf "=== Retrieving the latest data from the repository...\n" |
|
|
|
git fetch --all || return "$?" |
|
|
|
git fetch --all || return "$?" |
|
|
|
git rebase origin/develop_front develop_front || return "$?" |
|
|
|
|
|
|
|
git rebase origin/develop develop || return "$?" |
|
|
|
|
|
|
|
git rebase origin/master master || return "$?" |
|
|
|
git rebase origin/master master || return "$?" |
|
|
|
|
|
|
|
git rebase origin/develop develop || return "$?" |
|
|
|
|
|
|
|
git rebase origin/develop_front develop_front || return "$?" |
|
|
|
|
|
|
|
) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function wovn_update() { |
|
|
|
function wovn_update() { |
|
|
|