From 26ddaa62de0d7f2a6c787e90aca3e7a1a68d25d3 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 13 Nov 2015 11:04:45 +0000 Subject: [PATCH] updated branches list --- scripts/mergeAll.sh | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index b75a5938f..e50071983 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -7,7 +7,7 @@ git checkout yota2 git merge ice-cream-sandwich git checkout kindle -git merge yota2 +git merge ice-cream-sandwich git checkout nook git merge master @@ -15,23 +15,4 @@ git merge master git checkout microtypography git merge yota2 -git checkout 2.6-master -git merge master - -git checkout 2.6-ics -git merge 2.6-master -git merge ice-cream-sandwich - -git checkout 2.6-yota2 -git merge 2.6-ics -git merge yota2 - -git checkout 2.6-kindle -git merge 2.6-yota2 -git merge kindle - -git checkout 2.6-nook -git merge 2.6-master -git merge nook - git checkout master