]> source.dussan.org Git - vaadin-framework.git/commit
projects / vaadin-framework.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0f5831d) | patch
Update merge script to merge 7.0 to 7.1
authorLeif Åstrand <leif@vaadin.com>
Mon, 6 May 2013 11:24:04 +0000 (14:24 +0300)
committerLeif Åstrand <leif@vaadin.com>
Mon, 6 May 2013 11:43:48 +0000 (14:43 +0300)
commit888d34c55c15f244f0d68f82ae2c46fae24da630
treea61efb7202177483d72edcb2504f22af98e5d311tree | snapshot
parent0f5831df6f2a4bf31d4ca0a45e14662c8d172ef2commit | diff
Update merge script to merge 7.0 to 7.1

* Refactor so that source and target branches are defined in
variables in the beginning of the script.
* Pass a dummy commit message to the merge to avoid opening an editor
while running the script

Merge: manual

Change-Id: I76c001b3bfcfd2dbb1ce2e9ec1b730641df31a77
scripts/automerge7.sh diff | blob | history
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework