summaryrefslogtreecommitdiffstats
path: root/chromium/tools/merge_from_chromium.py
Commit message (Expand)AuthorAgeFilesLines
* Merge scripts: add LASTCHANGE.blink.Torne (Richard Coles)2013-05-311-0/+13
* automerger: push archived revisions and fix a bug.Torne (Richard Coles)2013-05-021-4/+10
* Merge tool: pass "all" to gyp_webview.Torne (Richard Coles)2013-04-301-1/+1
* Merge script: fix function reference.Torne (Richard Coles)2013-04-191-2/+2
* Merge tool: update merge_to_master for new projects.Torne (Richard Coles)2013-04-191-2/+12
* Update merge script to use new local-mirrored repos.Torne (Richard Coles)2013-04-171-43/+40
* Add --sha1 option to merge_from_chromium.pyBo Liu2013-02-261-9/+34
* Merge tool: change commit message.Torne (Richard Coles)2013-02-191-1/+1
* Add option to get the svn HEAD revisionBo Liu2013-02-041-2/+24
* Merge scripts: add missing log message.Torne (Richard Coles)2013-01-081-0/+2
* Merge scripts: detect no changes to merge case.Torne (Richard Coles)2013-01-081-1/+6
* Merge script: add an option to just retrieve LKGR.Torne (Richard Coles)2013-01-071-1/+7
* Merge scripts: fix stringification error.Torne (Richard Coles)2012-12-181-1/+1
* Merge scripts: preserve the gyp errors.Torne (Richard Coles)2012-12-141-2/+3
* Merge scripts: allow automation to be smarter.Torne (Richard Coles)2012-12-121-21/+45
* Add --svn_revision=HEAD to merge from tip of treeBo Liu2012-12-051-1/+11
* Merge scripts: support pushing via a temporary branch.Torne (Richard Coles)2012-12-031-1/+7
* Merge scripts: use logging instead of print.Torne (Richard Coles)2012-11-291-18/+21
* Merge scripts: merge from LKGR by default.Torne (Richard Coles)2012-11-231-18/+22
* Merge scripts: remove url/branch parameters.Torne (Richard Coles)2012-11-231-14/+4
* Merge scripts: implement an unattended mode.Torne (Richard Coles)2012-11-231-15/+29
* Merge scripts: clean up and refactor.Torne (Richard Coles)2012-11-231-63/+67
* Update merge script for multi-arch.Torne (Richard Coles)2012-11-191-11/+6
* Update merge with new repos/license info.Torne (Richard Coles)2012-11-161-2/+2
* Merge tool: refactor reusable code.Torne (Richard Coles)2012-11-081-0/+410