On Thu, Nov 29, 2018 at 9:43 AM Emilio Cobos Álvarez <emi...@crisal.io> wrote:
> On 11/29/18 1:38 PM, Sylvestre Ledru wrote: > > This extension will automatically rebase the local changes to avoid > > conflicts. > > Is there a way to do the same for cinnabar users? > Yes! Sorry for the delay... Please check out this script: https://github.com/ehsan/clang-format-reformat-branch. This does something similar to the format-source extension for Mercurial but done as a one-time tool, borrowing from the tool that the MongoDB project developed for the same use case. It takes a local branch based on a clone of mozilla-central that doesn't yet have the reformat commit and rebases it on top of the reformat commit, reformatting your local modifications in the process. I hope it proves to be helpful for the git users out there! The repository has full instructions on how to use it, but please let me know if you have any questions or hit any issues. Thanks, -- Ehsan _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
