summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
...
* | Script for merging changes from a bugfix branch into master (#11299)Artur Signell2013-03-121-0/+104
|/
* Fix merge checker issuesLeif Åstrand2012-10-191-2/+9
* Fix copy/paste error in teamcity integrationLeif Åstrand2012-07-241-1/+1
* Adjust merge check to work more nicely with team cityLeif Åstrand2012-07-241-5/+12
* Add script for automatically checking for unmerged commitsLeif Åstrand2012-07-241-0/+24
* Abort if merge failsArtur Signell2012-02-021-0/+6
* Optionally read password from fileArtur Signell2012-02-021-0/+5
* merge.sh now works in directories other than /versions/, like merge-all.sh al...Johannes Dahlström2012-01-311-2/+5
* User SVN_USER and SVN_PASS if givenArtur Signell2012-01-271-1/+7
* Bugfix: concatenate merge commands properlyJohannes Dahlström2012-01-271-1/+1
* Added exit codesArtur Signell2012-01-271-2/+3
* Added missing lineArtur Signell2012-01-271-1/+1
* Scripts for easing merge from 6.7Artur Signell2012-01-272-0/+102