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

typo

Browse source
This commit is contained in:
Mayel de Borniol 2024-02-24 19:13:02 +00:00
parent 38e8f44a5b
commit 58b901cd85
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
git-publish.sh
View file

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