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

inclure la liste des modifications dans le log

This commit is contained in:
Jephté Clain 2015-04-01 09:08:35 +04:00
parent 5b0715efe4
commit fc35a05366
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pdev
View File

@ -189,8 +189,15 @@ if [ "$action" == merge ]; then
estepn "Intégration ${COULEUR_VERTE}$feature${COULEUR_NORMALE} --> ${COULEUR_BLEUE}develop${COULEUR_NORMALE}"
ask_yesno "Voulez-vous continuer?" O || die
# calculer la suite des modifications
mergemsg="Intégration de la branche $feature"
setx mergebase=git merge-base develop "$feature"
setx modifs=git log --oneline "$mergebase..$feature"
[ -n "$modifs" ] && mergemsg="$mergemsg
$modifs"
git checkout develop || die
git merge "$feature" -m "Intégration de la branche $feature" --no-ff || die
git merge "$feature" -m "$mergemsg" --no-ff || die
# mettre à jour la branche sur laquelle on se trouve
setx branch=git_get_branch