aboutsummaryrefslogtreecommitdiff
path: root/lib/merge.sh
AgeCommit message (Collapse)Author
2016-05-16Update copyright dates, aways use bash instead of sh, since on some systems ↵Rob Savoye
it's dash instead. Change-Id: I2b819d18b52e35045684948084b125c35d4d43a6
2015-08-17remove unused protocols, svn, br, lpRob Savoye
Change-Id: I355909aea040f4cda1d7f6ffe3c915e70e3044fe
2014-11-17rename cbuild to abeRob Savoye
Change-Id: I5999d5375734b62a9ffe3d1ecf5335c178a545d3
2014-03-03add GPLv3 copyright blockRob Savoye
Change-Id: Id42359fc1f5324ea2dd6fa18eaf6a4c4fb79fb3a
2013-09-15add timestamps for the various stages to speed up repeat bui;ds. Make most ↵Rob Savoye
variables in functions typedef local.
2013-06-20add merge_bzr_commit(). Add mor logging, remove copied display functionsRob Savoye
2013-06-19use an r before the revison numberRob Savoye
2013-06-19make merge_branch() use full paths so we can execute it from anywhereRob Savoye
2013-06-19process a diff file into a bzr branchRob Savoye
2013-06-19rename merge_branches() to merge_branch(), work with repeat author ChangeLog ↵Rob Savoye
enties
2013-06-19initial support for GCC merges. Currently just fixes the ChangeLog entriesRob Savoye
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 22:56:02 +0000