summaryrefslogtreecommitdiff
path: root/chromium/tools/merge_from_chromium.py
AgeCommit message (Expand)Author
2014-11-07Push m39 glue to chromium-devBo Liu
2014-01-30Merge scripts: duplicate arm makefile for arm64.Torne (Richard Coles)
2014-01-02Reland "automerger: download gn before generating makefiles."Richard Coles
2013-09-10Merge scripts: fix force pushing to temp branch.Torne (Richard Coles)
2013-09-09Merge scripts: fix merging trunk.Torne (Richard Coles)
2013-09-09Merge scripts: support merging from Chromium releases.Torne (Richard Coles)
2013-08-05Automerger: generate makefiles before checking licenses.Torne (Richard Coles)
2013-05-31Merge scripts: add LASTCHANGE.blink.Torne (Richard Coles)
2013-05-02automerger: push archived revisions and fix a bug.Torne (Richard Coles)
2013-04-30Merge tool: pass "all" to gyp_webview.Torne (Richard Coles)
2013-04-19Merge script: fix function reference.Torne (Richard Coles)
2013-04-19Merge tool: update merge_to_master for new projects.Torne (Richard Coles)
2013-04-17Update merge script to use new local-mirrored repos.Torne (Richard Coles)
2013-02-26Add --sha1 option to merge_from_chromium.pyBo Liu
2013-02-19Merge tool: change commit message.Torne (Richard Coles)
2013-02-04Add option to get the svn HEAD revisionBo Liu
2013-01-08Merge scripts: add missing log message.Torne (Richard Coles)
2013-01-08Merge scripts: detect no changes to merge case.Torne (Richard Coles)
2013-01-07Merge script: add an option to just retrieve LKGR.Torne (Richard Coles)
2012-12-18Merge scripts: fix stringification error.Torne (Richard Coles)
2012-12-14Merge scripts: preserve the gyp errors.Torne (Richard Coles)
2012-12-12Merge scripts: allow automation to be smarter.Torne (Richard Coles)
2012-12-05Add --svn_revision=HEAD to merge from tip of treeBo Liu
2012-12-03Merge scripts: support pushing via a temporary branch.Torne (Richard Coles)
2012-11-29Merge scripts: use logging instead of print.Torne (Richard Coles)
2012-11-23Merge scripts: merge from LKGR by default.Torne (Richard Coles)
2012-11-23Merge scripts: remove url/branch parameters.Torne (Richard Coles)
2012-11-23Merge scripts: implement an unattended mode.Torne (Richard Coles)
2012-11-23Merge scripts: clean up and refactor.Torne (Richard Coles)
2012-11-19Update merge script for multi-arch.Torne (Richard Coles)
2012-11-16Update merge with new repos/license info.Torne (Richard Coles)
2012-11-08Merge tool: refactor reusable code.Torne (Richard Coles)