summaryrefslogtreecommitdiff
path: root/doc/development/automatic_ce_ee_merge.md
Commit message (Expand)AuthorAgeFilesLines
* Update capitalization in /dev docsMarcel Amirault2019-08-271-2/+2
* Update docs to pass new markdownlintMarcel Amirault2019-08-221-4/+4
* Fix minor typo: CE -> EEArun Kumar Mohan2019-08-191-1/+1
* Add section on how we run CE->EE merge at GitLabAsh McKenzie2019-08-151-0/+13
* Small markdown tweaks to clear kramdown warningsMarcel Amirault2019-07-041-26/+27
* Ensure all lists are surrounded by new linesEvan Read2019-02-221-10/+10
* Fix typosKatrin Leinweber2019-01-211-2/+2
* Fix documentation for automatic mergingYorick Peterse2018-12-131-11/+13
* Update automatic merging documentationYorick Peterse2018-12-111-83/+177
* Updated documentation of CE to EE mergesYorick Peterse2018-12-041-177/+106
* Instruct against squashing in CE to EE MRsdocs/ce-to-ee-no-squashAchilleas Pipinellis2018-11-231-0/+3
* Correct grammar (setup to set-up) in DocsMarcel Amirault2018-09-211-1/+1
* Resolve "CE documentation is not CommonMark compliant"Brett Walker2018-09-061-18/+18
* Update git rerere link in docsgfyoung2018-08-071-1/+1
* Docs guidelines: cherry-picking commits from CE to EEMarcia Ramos2018-03-061-0/+93
* Improve doc/development/automatic_ce_ee_merge.mdRémy Coutable2018-02-011-8/+23
* doc: Spelling fixesVille Skyttä2018-01-191-1/+1
* Remove a header level in the new 'Automatic CE->EE merge' docRémy Coutable2017-12-111-1/+1
* Address Robert's and Axil's feedbackRémy Coutable2017-12-061-12/+14
* Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable2017-12-051-0/+91
View Lorry Controller Status