| Commit message (Expand) | Author | Age | Files | Lines |
* | Commit and push everything before a conflicting commit | Leif Åstrand | 2013-05-17 | 1 | -3/+23 |
* | Don't start merging if there are uncommitted changes | Leif Åstrand | 2013-05-06 | 1 | -0/+8 |
* | Update merge script to merge 7.0 to 7.1 | Leif Åstrand | 2013-05-06 | 1 | -7/+9 |
* | Include commit id and message in merge commit message | Artur Signell | 2013-04-23 | 1 | -6/+20 |
* | Ensure no-op merges get a change id | Artur Signell | 2013-04-23 | 1 | -1/+4 |
* | Merge commit '6922bc5b49c5551b289a5025ccd5901e2ac3aafc' | Artur Signell | 2013-03-12 | 1 | -3/+1 |
|\ |
|
| * | Don't provide details to teamcity as it nowadays gets those from stdout | Leif Åstrand | 2013-03-06 | 1 | -3/+1 |
* | | Script for merging changes from a bugfix branch into master (#11299) | Artur Signell | 2013-03-12 | 1 | -0/+104 |
|/ |
|
* | 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 |
* | Optionally read password from file | Artur Signell | 2012-02-02 | 1 | -0/+5 |
* | merge.sh now works in directories other than /versions/, like merge-all.sh al... | Johannes Dahlström | 2012-01-31 | 1 | -2/+5 |
* | User SVN_USER and SVN_PASS if given | Artur Signell | 2012-01-27 | 1 | -1/+7 |
* | Bugfix: concatenate merge commands properly | Johannes Dahlström | 2012-01-27 | 1 | -1/+1 |
* | Added exit codes | Artur Signell | 2012-01-27 | 1 | -2/+3 |
* | Added missing line | Artur Signell | 2012-01-27 | 1 | -1/+1 |
* | Scripts for easing merge from 6.7 | Artur Signell | 2012-01-27 | 2 | -0/+102 |