fast-forwarder si possible
This commit is contained in:
parent
f64117c176
commit
ffa91952c2
1
pdev
1
pdev
|
@ -129,6 +129,7 @@ if [ "$action" == branch ]; then
|
|||
|
||||
# Créer/basculer vers une feature branch
|
||||
git_ensure_cleancheckout
|
||||
is_any_branch "$feature" develop feature || die "$release: ce n'est pas une feature branch"
|
||||
r=0
|
||||
if git_have_branch "$feature"; then
|
||||
git checkout "$feature" || r=$?
|
||||
|
|
5
prel
5
prel
|
@ -247,6 +247,7 @@ if [ "$action" == checkout ]; then
|
|||
if [ -z "$UTOOLS_VCS_OFFLINE" ]; then
|
||||
git_track_branch "$release" "$origin"
|
||||
fi
|
||||
git_fast_forward "$release" "" "$origin"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
@ -273,6 +274,10 @@ Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULE
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
if [ "$r" -eq 0 ]; then
|
||||
# éventuellement fast-forwarder automatiquement
|
||||
git_fast_forward "$release" "" "$origin"
|
||||
fi
|
||||
|
||||
if [ "$r" -eq 0 -a -n "$merge" ]; then
|
||||
set -- "$release"
|
||||
|
|
Loading…
Reference in New Issue