vaadin-framework.git - Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework

	Commit message (Collapse)	Author	Age	Files	Lines
*	Commit and push everything before a conflicting commit	Leif Åstrand	2013-05-17	1	-3/+23
\| \| \| \|	Change-Id: Ifdc45e2b0f540ac8212aaca835b9d11c18078eb5
*	Don't start merging if there are uncommitted changes	Leif Åstrand	2013-05-06	1	-0/+8
\| \| \| \|	Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3
*	Update merge script to merge 7.0 to 7.1	Leif Åstrand	2013-05-06	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \|	* 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
*	Include commit id and message in merge commit message	Artur Signell	2013-04-23	1	-6/+20
\| \| \| \|	Change-Id: I2557eddcb4fbd4fd1ec5c608a0d73c7fa1b243b6
*	Ensure no-op merges get a change id	Artur Signell	2013-04-23	1	-1/+4
\| \| \| \|	Change-Id: Icda1db985b3a0654fa1274e700cddfe2f990df12
*	Script for merging changes from a bugfix branch into master (#11299)	Artur Signell	2013-03-12	1	-0/+104
	* Supports "Merge: no" for changesets which should be skipped, e.g. release notes updates. * Supports "Merge: manual" which will causes the merge to stop, requiring somebody to manually merge to change before continuing Change-Id: If5d1291ec77f4c1e31b3afb8420a45ecceedfa15