Rebase onto new history about airsonic HOT 3 CLOSED

Comment by EugeneKay
Sunday May 08, 2016 at 03:24 GMT

I have pushed the new git history as develop, which is an orphan(unconnected) branch. All other branches and tags have been removed. You should re-clone your local repository and force-push or re-clone any Github forks. I created Libresonic/subsonic-svn and pushed the old history and tags there for archival.

I rebased-out the 6.0-beta1 merge and related changes, rolling back to 5.3. A direct-rebase against the new history failed because of the orphan branch and the difference in line-endings between the two histories. Instead, I copied the current state into develop, and committed the result. This loses authorship history, but this is worth the saved trouble.

from airsonic.

Comment by slang800
Sunday May 08, 2016 at 11:39 GMT

Aww... now the git log is cleared and we can't see the history of the code :(

from airsonic.

Comment by EugeneKay
Sunday May 08, 2016 at 16:30 GMT

Per my last comment, the old history was pushed to https://github.com/Libresonic/subsonic-svn for archival. You can reference it there if necessary.

from airsonic.