aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2023-08-16ci-merge: allow forcing rebuild of the integration treeHEADmasterDmitry Baryshkov
2023-02-02ci-merge: fix a problem of not merged remote into integration branchVladimir Zapolskiy
2021-02-22ci-merge: properly filter out remotes from local treeNicolas Dechesne
2020-11-24ci-merge: do_remove_old add quotes in REMOTE_BRANCHAníbal Limón
2020-11-24ci-merge: Add missing -q to grep when searching for old branchesAníbal Limón
2018-08-29ci-merge: Improve READMEAmit Kucheria
2018-08-29ci-merge: Remove the terminal() functionAmit Kucheria
2018-08-29ci-merge: fix messages, grammarAmit Kucheria
2018-08-29ci-merge: Introduce interactive modeAmit Kucheria
2018-08-29ci-merge: Clone rr-cache into .automergeBjorn Andersson
2018-08-29ci-merge: Allow local overridesBjorn Andersson
2018-08-29ci-merge: Allow specifying config file on the cmdlineBjorn Andersson
2018-08-29ci-merge: Allow running mergetool without XBjorn Andersson
2018-07-06README: fix example CONFIG_PATHNiklas Cassel
2018-06-27ci-merge: use git describe when archiving the previous branchNicolas Dechesne
2018-06-27ci-merge: enfore merge.conflictstyle is set to 'merge'Nicolas Dechesne
2018-05-31ci-merge: Require REMOTE_REPO and RR_CACHE to be specified explicitlyAmit Kucheria
2018-05-29ci-merge: If a merge failed exit instead of continueAníbal Limón
2018-05-07ci-merge: When a merge conflict exists try to commitAníbal Limón
2018-05-07ci-merge: Enable git rerere autoupdateAníbal Limón
2018-05-02Begin a README for automergeAmit Kucheria
2018-05-02ci-merge: Simplify obtaining remote branch name of remoteAmit Kucheria
2018-05-02ci-merge: simplify obtaining URL of remote using built-in commandAmit Kucheria
2018-05-02ci-merge: Rerere cache sharingAmit Kucheria
2018-04-23ci-blame: Whitespace cleanupsAmit Kucheria
2018-04-23ci-merge: handle the case of a dirty local git treeAmit Kucheria
2018-04-20ci-merge: Don't try to make manual merge if no DISPLAYAníbal Limón
2018-04-17ci-merge: Add support for push integ history branchAníbal Limón
2018-04-17ci-{config, report, test}: Add support to specify settings from outsideAníbal Limón
2018-04-03ci-merge: Add a timestamp to old integration treesAmit Kucheria
2018-04-03Use the generic x-terminal-emulator where available instead of forcing xtermAmit Kucheria
2018-04-03ci-merge: Correctly print the URL and BRANCH name of the remote being deletedAmit Kucheria
2018-04-03config sample: better describe the sample configuration fileAmit Kucheria
2018-03-28Change the hidden configuration directory name to .automergeDaniel Lezcano
2018-03-28As we will share the scripts with everyone in Linaro, let change the nameDaniel Lezcano
2017-11-05pmwg-ci: Fix baseline used as remote changeDaniel Lezcano
2017-10-31pmwg-ci: Fix missing path setupDaniel Lezcano
2017-10-31pmwg-ci: Fix help messages and commentDaniel Lezcano
2017-10-27pmwg-ci: Don't merge the baseline branch on itselfDaniel Lezcano
2017-10-27pmwg-ci: Get the last commit id or the last tagDaniel Lezcano
2017-10-27pmwg-ci: Add the track optionDaniel Lezcano
2017-10-27pmwg-ci: Encapsulate the options parsing into a functionDaniel Lezcano
2017-10-27pmwg-ci: Initialize correctly and get the baseline branchDaniel Lezcano
2017-10-26pmwg-ci: Baseline topic must be in the config file nowDaniel Lezcano
2017-10-26pmwg-ci: Improve the help message and exit when the help is askedDaniel Lezcano
2017-10-26pmwg-ci: Rename the BASELINE variableDaniel Lezcano
2017-10-26pmwg-ci-integ: Encapsulate the get last tag commandDaniel Lezcano
2017-10-24pmwg-ci: Add option to the pmwg-ci-integ scriptDaniel Lezcano
2017-10-23pmwg-ci-report: launch tests when boot/build succeedVincent Guittot
2017-05-04pmwg-ci-report: fix url of logs summaryVincent Guittot