Xavier Morel a9b4b373c2 [CHG] runbot_merge: convert rebase-ff staging to working locally ... Implemented rebase (-ish?) by hand, following the model of the one built on the github API, so we have all the information we need *and* still don't need a local working copy. Had to update *several* tests due to formatting changes from using the CLI git (maybe that could be avoided by feeding the commit message through stdin but w/e). Also added a dupe of an existing helper for the formatting changes bit, will have to remove it once all's done.		2023-08-22 14:17:22 +02:00
..
utils.py	[CHG] runbot_merge: convert rebase-ff staging to working locally	2023-08-22 14:17:22 +02:00