summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Add archetype validation scripts.Sauli Tähkäpää2015-01-226-0/+250
* Script for replacing all empty @since tags with a given versionArtur Signell2014-08-191-0/+30
* install-local-maven.sh: use proper quotingAntti Tanhuanpää2014-06-181-11/+11
* Script for installing build artifacts to the local Maven repositoryArtur Signell2014-06-031-0/+41
* Remove the automerge scriptJonatan Kronqvist2014-05-051-165/+0
* Merge from 7.1 to 7.2Artur Signell2014-04-161-2/+2
* Merge from 7.2Artur Signell2014-04-111-1/+1
* Email author about merge failuresArtur Signell2014-02-261-0/+12
* Use different exit codes for different errorsArtur Signell2014-02-251-8/+8
* Fix typo in automerge scriptLeif Åstrand2013-10-041-1/+1
* Escape \ in commit messagesLeif Åstrand2013-06-071-1/+1
* Ignore changes merged from the previous maintenance branchLeif Åstrand2013-06-071-1/+3
* Merge changes from origin/7.1Leif Åstrand2013-05-171-3/+23
|\
| * Commit and push everything before a conflicting commitLeif Åstrand2013-05-171-3/+23
* | Merge changes from origin/7.1Leif Åstrand2013-05-101-0/+8
|\|
| * Don't start merging if there are uncommitted changesLeif Åstrand2013-05-061-0/+8
* | Update merge specification for the master branch.Leif Åstrand2013-05-071-2/+2
|/
* Update merge script to merge 7.0 to 7.1Leif Åstrand2013-05-061-7/+9
* Include commit id and message in merge commit messageArtur Signell2013-04-231-6/+20
* Ensure no-op merges get a change idArtur Signell2013-04-231-1/+4
* Merge commit '6922bc5b49c5551b289a5025ccd5901e2ac3aafc'Artur Signell2013-03-121-3/+1
|\
| * Don't provide details to teamcity as it nowadays gets those from stdoutLeif Åstrand2013-03-061-3/+1
* | 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