Intégration de la branche ptools
This commit is contained in:
commit
4578219236
2
pdev
2
pdev
|
@ -141,6 +141,8 @@ if [ "$action" == branch ]; then
|
||||||
r=0
|
r=0
|
||||||
if git_have_branch "$feature"; then
|
if git_have_branch "$feature"; then
|
||||||
git checkout "$feature" || r=$?
|
git checkout "$feature" || r=$?
|
||||||
|
elif git_have_rbranch "$feature" "$origin"; then
|
||||||
|
git checkout "$feature" || r=$?
|
||||||
else
|
else
|
||||||
estepn "\
|
estepn "\
|
||||||
Vous allez créer la nouvelle feature branch ${COULEUR_VERTE}$feature${COULEUR_NORMALE}
|
Vous allez créer la nouvelle feature branch ${COULEUR_VERTE}$feature${COULEUR_NORMALE}
|
||||||
|
|
2
prel
2
prel
|
@ -261,6 +261,8 @@ if [ "$action" == checkout ]; then
|
||||||
r=0
|
r=0
|
||||||
if git_have_branch "$release"; then
|
if git_have_branch "$release"; then
|
||||||
git checkout "$release"; r=$?
|
git checkout "$release"; r=$?
|
||||||
|
elif git_have_rbranch "$release"; then
|
||||||
|
git checkout "$release"; r=$?
|
||||||
else
|
else
|
||||||
estepn "\
|
estepn "\
|
||||||
Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULEUR_NORMALE}
|
Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULEUR_NORMALE}
|
||||||
|
|
Loading…
Reference in New Issue