From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 29 May 2018 10:45:13 +0000 (+0200)
Subject: Add submodule merging script
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2894add3529f55dcd1834e73a6f463e6712b1c98;p=docker-django-scripts.git

Add submodule merging script
---

diff --git a/dev/merge.sh b/dev/merge.sh
new file mode 100644
index 0000000..cacc8f6
--- /dev/null
+++ b/dev/merge.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This script merges all submodule dev branches defined as branch-dev in every .gitmodules files into the related master branches defined in branch-master.
+# If there is no definition branches for you submodule, the script will merge the dev branch
+
+cd "$(dirname "$0")"/../../
+
+git submodule foreach --recursive 'echo $name; git merge $(git config -f $toplevel/.gitmodules submodule.$name.branch-dev || echo dev)'