summaryrefslogtreecommitdiffstats
path: root/scripts/automerge7.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* Script for merging changes from a bugfix branch into master (#11299)Artur Signell2013-03-121-0/+104