From cf42fb1591b60d7a36c79b94e044651f5ad60ed4 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 25 Jul 2013 00:37:12 +0100 Subject: [PATCH] a rollback: my git does not know about --no-edit option --- scripts/mergeAll.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 09580f5fd..fe66e011e 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -1,16 +1,16 @@ #!/bin/sh git checkout android-1.5 -git merge --no-edit master +git merge master git checkout ice-cream-sandwich -git merge --no-edit master +git merge master git checkout beta -git merge --no-edit master +git merge master git checkout beta-ics -git merge --no-edit beta -git merge --no-edit ice-cream-sandwich +git merge beta +git merge ice-cream-sandwich git checkout master