Intégration de la branche ptools

This commit is contained in:
Jephté Clain 2015-04-01 08:30:37 +04:00
commit 4578219236
2 changed files with 4 additions and 0 deletions

2
pdev
View File

@ -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
View File

@ -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}