modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetic

This commit is contained in:
Jephte CLAIN 2015-03-31 17:59:21 +04:00
parent 5f6d5bb1ea
commit 2f41de35b7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pdev
View File

@ -156,9 +156,6 @@ Vous allez créer la nouvelle feature branch ${COULEUR_VERTE}$feature${COULEUR_N
git_fast_forward "$feature" "" "$origin" git_fast_forward "$feature" "" "$origin"
fi fi
# mettre à jour la branche sur laquelle on se trouve
setx branch=git_get_branch
exit $? exit $?
fi fi
@ -191,7 +188,7 @@ if [ "$action" == merge ]; then
ask_yesno "Voulez-vous continuer?" O || die ask_yesno "Voulez-vous continuer?" O || die
git checkout develop || die git checkout develop || die
git merge "$feature" -m "Intégration de la feature branch $feature" --no-ff || die git merge "$feature" -m "Intégration de la branche $feature" --no-ff || die
# mettre à jour la branche sur laquelle on se trouve # mettre à jour la branche sur laquelle on se trouve
setx branch=git_get_branch setx branch=git_get_branch