Skip to content
CDanU edited this page Sep 26, 2017 · 1 revision

Before being migrated to Git, Uncrustify was located in a SVN repository at Sourceforge. At that time of the migration no clean transition from SVN to Git was made to preserve the old history. Fortunately Git provides a mechanism to (fake) join old and new commits together locally: git replace

Create, list, delete refs to replace objects

Adds a replace reference in refs/replace/ namespace.

For that reason the old SVN history was converted and put into the branch: master_legacy.

To locally combine the master and the master_legacy branch do the following:

  1. fetch the master_legacy branch
  2. apply: git replace fe25b6d06401b0a523e15a896831720c488bd5ce 78da3cf5196a3e29de5adedd50ccea06b6a55925

Note that this does not alter the history of the master branch. One can keep working as if nothing has changed.

To remove the combination apply: git replace -d fe25b6d06401b0a523e15a896831720c488bd5ce