diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-07 12:13:43 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-07 12:32:13 +0300 |
| commit | 8d1ccd76bef6ead837ddb93de307ceee97d6b97b (patch) | |
| tree | 5654bd5489557aafabfe12b7d3cdca8aa5184ab5 /scripts | |
| parent | 20b169873dbacf9eb7135a861bc5cf15177225ee (diff) | |
| download | vaadin-framework-8d1ccd76bef6ead837ddb93de307ceee97d6b97b.tar.gz vaadin-framework-8d1ccd76bef6ead837ddb93de307ceee97d6b97b.zip | |
Ignore changes merged from the previous maintenance branch
Change-Id: I16a203db76fd6dc7e091a2b2708f80b9d4cef079
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 7b8c37a5aa..935604fb5d 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -1,8 +1,10 @@ #!/bin/bash +IGNORE=7.0 FROM=7.1 TO=master +IGNORE_HEAD=origin/$IGNORE FROM_HEAD=origin/$FROM PUSH="origin HEAD:refs/for/$TO" @@ -86,7 +88,7 @@ fi git checkout $TO git fetch -pending=`git log $TO..$FROM_HEAD --reverse|grep "^commit "|sed "s/commit //"` +pending=`git log $TO..$FROM_HEAD ^$IGNORE_HEAD --reverse|grep "^commit "|sed "s/commit //"` pendingCommit= pendingCommitMessage= |