Github wiki subtree merged in wiki/ #57
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…le names, for those not using a Linux package manager, and flesh out the manual installation section.
anarcat
force-pushed
the
in-tree-manual
branch
5 times, most recently
from
01c8943
to
b73848b
Compare
|
this merge is now ready for review - once this is merged, I guess we should just delete or disable the wiki somehow. |
This was performed with:
git clone https://github.com/Git-Mediawiki/Git-Mediawiki.wiki.git
cd Git-Mediawiki.wiki
git filter-branch --tree-filter 'mkdir -p docs ; mv *.md docs/' HEAD
cd ../Git-Mediawiki
git remote add -f wiki ../Git-Mediawiki.wiki
git merge --allow-unrelated wiki/master
This was prefered over a subtree merge because history is followed
properly. It is a known issue that subtree merges cannot follow
history:
https://stackoverflow.com/a/14448022/2408130
anarcat
force-pushed
the
in-tree-manual
branch
from
b73848b
to
5a99f5b
Compare
|
i redid the merge using a filter-branch technique because the previous subtree merge approach fails to follow history properly. |
|
Nice. Note that the wiki contained a lot of drafty or not up-to-date stuff. The user-manual is the only really important part. It's nice to have other pages in our history but it'd also be nice to do a bit of cleanup. |
|
well, yes, there is an infinity of improvements to do everywhere. I'm just trying to fix the obvious stuff i have in my pipeline that follow from the move from core git. and it's not easy to just keep up with that so "cleanups" will wait until someone else (tm) steps in to do those. ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge wiki into docs/ directory
This was performed with:
This was prefered over a subtree merge because history is followed
properly. It is a known issue that subtree merges cannot follow
history:
https://stackoverflow.com/a/14448022/2408130
Closes: #9