mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-17 08:32:41 +00:00
Code Issues Projects Releases Wiki Activity

$

Browse source
This commit is contained in:
Mayel de Borniol 2023-07-18 09:41:53 +01:00
parent 0d825d5f0c
commit bbacf7a1d5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-publish.sh
View file

@ -2,12 +2,12 @@
DIR="${1:-$PWD}"
function maye_rebase {
if [[ $2 == 'pull' ]]
if [[ $1 == 'pull' ]]
then
git pull --rebase || fail "Please resolve conflicts before continuing."
fi
if [[ $2 == 'rebase' ]]
if [[ $1 == 'rebase' ]]
then
rebase
fi
@ -48,7 +48,7 @@ then
# fi
# merge/rebase local changes
maye_rebase
maye_rebase $2
if [[ $3 != 'only' ]]
then
@ -59,5 +59,5 @@ else
set -e
echo "No local changes to push"
maye_rebase
maye_rebase $2
fi