From 6dd48cd3168df6e8f29dd64454deb293de0f784a Mon Sep 17 00:00:00 2001 From: Thomas Bonfort Date: Wed, 4 Apr 2012 13:14:43 +0200 Subject: [PATCH] add script to recursively apply stable fixes to newer branches --- stablemerge.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 stablemerge.sh diff --git a/stablemerge.sh b/stablemerge.sh new file mode 100644 index 0000000000..b32243efd3 --- /dev/null +++ b/stablemerge.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +git checkout branch-5-0 +if $?; then exit; fi +git merge branch-4-10 +if $?; then exit; fi +git checkout branch-5-2 +if $?; then exit; fi +git merge branch-5-0 +if $?; then exit; fi +git checkout branch-5-4 +if $?; then exit; fi +git merge branch-5-2 +if $?; then exit; fi +git checkout branch-5-6 +if $?; then exit; fi +git merge branch-5-4 +if $?; then exit; fi +git checkout branch-6-0 +if $?; then exit; fi +git merge branch-5-6 +if $?; then exit; fi +git checkout master +if $?; then exit; fi +git merge branch-6-0