From 40f1bf6be177cae87bf2d826f51445efc8d8a9a7 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 26 Feb 2016 14:03:31 +0400
Subject: [PATCH] =?UTF-8?q?prel:=20apr=C3=A8s=20avoir=20fusionn=C3=A9=20un?=
 =?UTF-8?q?e=20branche,=20revenir=20sur=20develop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prel | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/prel b/prel
index e446a8d..dcb590f 100755
--- a/prel
+++ b/prel
@@ -373,6 +373,7 @@ elif is_release_branch "$branch"; then
     release="$branch"
 fi
 
+final_branch= # branche sur laquelle se placer après avoir fusionné la branche de release
 if [ "$action" == merge ]; then
     confirm=
 
@@ -433,6 +434,7 @@ ou celle-ci pour pour pousser TOUS les tags:
     setx branch=git_get_branch
 
     action=delete
+    final_branch=develop
 fi
 
 if [ "$action" == delete -a "$release" != develop ]; then
@@ -501,3 +503,8 @@ elif [ "$action" == diff ]; then
         fi
     fi
 fi
+
+# en fin de traitement, revenir le cas échéant sur $final_branch
+if [ -n "$final_branch" ]; then
+    git checkout "$final_branch" || die
+fi