summaryrefslogtreecommitdiffstats
path: root/llvm/utils/release/merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* Release merge script: don't actually commit the mergeHans Wennborg2015-01-131-4/+6
| | | | | | | | Instead, just present the command for committing it. This way, the user can test the merge locally, resolve conflicts, etc. before committing, which seems much safer to me. llvm-svn: 225737
* Update the tree before applying patch.Bill Wendling2011-10-161-0/+2
| | | | llvm-svn: 142155
* Add a script that helps merge changes into a release branch.Bill Wendling2011-10-161-0/+72
llvm-svn: 142097
OpenPOWER on IntegriCloud