requarks / wiki-v1

Legacy version (1.x) of Wiki.js
https://wiki.js.org
GNU Affero General Public License v3.0
100 stars 75 forks source link

Configure git to allow-unrelated-histories #185

Open robp2175 opened 5 years ago

robp2175 commented 5 years ago

Actual behavior

FETCH_HEAD\nfatal: refusing to merge unrelated histories\n

I am committing to my gitlab repo from two different places. I don't plan to ever create content directly on Wiki.js. However due to this fact I get this error which can easily be avoided by adding --allow-unrelated-histories. However, I am not sure exactly where I would add this in /libs/git.js

Expected behavior

Allow --allow-unrelated-histories

Steps to reproduce the behavior

Without adding this tag permanently, this will fail after any time I perform a push from the other location. I understand that I will need to add this back in if there is ever an upgrade to this file.

I know this is not the place and will fill out a feature request, but it would be great to be able to add additional git flags in the config. However, this would certainly be low on the prioity list.