aboutsummaryrefslogtreecommitdiff
path: root/ci-merge
AgeCommit message (Expand)Author
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-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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:01:32 +0000