| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| * | Merge commit '6922bc5b49c5551b289a5025ccd5901e2ac3aafc' | Artur Signell | 2013-03-12 | 1 | -3/+1 |
| |\ | | | | | | | Change-Id: Id118fd9bae1fdf7e7ce2efd660ade5ba7bbc5109 | ||||
| | * | Don't provide details to teamcity as it nowadays gets those from stdout | Leif Åstrand | 2013-03-06 | 1 | -3/+1 |
| | | | | | | | | | Change-Id: I2c1e80307efaa963313bf89284066bc0429e9cd8 | ||||
| * | | 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 | ||||
| * | Fix merge checker issues | Leif Åstrand | 2012-10-19 | 1 | -2/+9 |
| | | |||||
| * | Fix copy/paste error in teamcity integration | Leif Åstrand | 2012-07-24 | 1 | -1/+1 |
| | | |||||
| * | Adjust merge check to work more nicely with team city | Leif Åstrand | 2012-07-24 | 1 | -5/+12 |
| | | |||||
| * | Add script for automatically checking for unmerged commits | Leif Åstrand | 2012-07-24 | 1 | -0/+24 |
| | | |||||
| * | Abort if merge fails | Artur Signell | 2012-02-02 | 1 | -0/+6 |
| | | | | | svn changeset:22856/svn branch:6.8 | ||||
| * | Optionally read password from file | Artur Signell | 2012-02-02 | 1 | -0/+5 |
| | | | | | svn changeset:22850/svn branch:6.8 | ||||
| * | merge.sh now works in directories other than /versions/, like merge-all.sh ↵ | Johannes Dahlström | 2012-01-31 | 1 | -2/+5 |
| | | | | | | | already does svn changeset:22842/svn branch:6.8 | ||||
| * | User SVN_USER and SVN_PASS if given | Artur Signell | 2012-01-27 | 1 | -1/+7 |
| | | | | | svn changeset:22807/svn branch:6.8 | ||||
| * | Bugfix: concatenate merge commands properly | Johannes Dahlström | 2012-01-27 | 1 | -1/+1 |
| | | | | | svn changeset:22804/svn branch:6.8 | ||||
| * | Added exit codes | Artur Signell | 2012-01-27 | 1 | -2/+3 |
| | | | | | svn changeset:22800/svn branch:6.8 | ||||
| * | Added missing line | Artur Signell | 2012-01-27 | 1 | -1/+1 |
| | | | | | svn changeset:22786/svn branch:6.8 | ||||
| * | Scripts for easing merge from 6.7 | Artur Signell | 2012-01-27 | 2 | -0/+102 |
| svn changeset:22783/svn branch:6.8 | |||||
 |
index : vaadin-framework.git | |
| Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework | www-data |
| summaryrefslogtreecommitdiffstats |