forked from git/git
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge git-for-windows/git/wiki
#4951
Open
dscho
wants to merge
594
commits into
git-for-windows:main
Choose a base branch
from
dscho:merge-git-for-windows/git/wiki
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Merge git-for-windows/git/wiki
#4951
dscho
wants to merge
594
commits into
git-for-windows:main
from
dscho:merge-git-for-windows/git/wiki
+2,638
−5
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
…vs to try out the Upstream->GfW->personal release process.
…he fake merge works, and how to 'replace' it.
Totally off topic for Git for Windows. This reverts commit dc65844. Signed-off-by: Johannes Schindelin <[email protected]>
…s panels and command line arguments.
…rguments (markdown)
…rguments (markdown)
…rguments (markdown)
Like any good index, it has an inherent (alphabetical) order. Unfortunately, this was missed when a new item was added recently. Using my teutonic thoroughness, I set the order right again. Signed-off-by: Johannes Schindelin <[email protected]>
…rguments (markdown)
…ng for `git.sln` on the `vs/main` branch 👍
…indowsHelper GitHub App
…git-for-windows/ In the recent years, Git for Windows' wiki has seen more vandalizing than helpful contributions, and sadly the bandwidth of Git for Windows' contributors is such that such destructive behavior is frequently detected only after a noticeable time. Let's prevent such disruptions by merging the wiki into `Documentation/git-for-windows/`, locking down the wiki, and then replacing each page with a link to its new home. This commit accomplishes step number one, a trick performed via: git pull --allow-unrelated-histories --no-commit \ -Xsubtree=Documentation/git-for-windows/ \ https://github.com/git-for-windows/git.wiki.git master and then fixing it up (because the `-Xsubtree` trick did not work as expected): for f in $(git ls-tree HEAD^2 | sed 's|.*\t||') do git mv $f Documentation/git-for-windows/ done Signed-off-by: Johannes Schindelin <[email protected]>
This file is no longer used after the merge into the main repository. Signed-off-by: Johannes Schindelin <[email protected]>
These were stale for a while, it would appear. Signed-off-by: Johannes Schindelin <[email protected]>
Since we just merged the wiki into the main repository (to stave off future vandalism), let's change the links in this here repository so they point at the new location. This trick was performed by: # Construct `sed` instructions for replacing the basenames of the wiki # links with URL-encoded versions that also add the Markdown file # extension `.md`, being careful only to replace the actual Markdown # _links_ (i.e. the basename must be preceded either by a slash or by # an opening parenthesis, and followed by a closing parenthesis or # a hash character indicating an anchor). extra="$(git -C Documentation/git-for-windows/ ls-files | sed -n '/\.md$/{ s|`|%60|g h s|'\''|%27|g s|(|%28|g s|)|%29|g x s|\.md$|| s|'\''|&\\&&|g s|\.|\\&|g G s|^|-e '\''s@\\([/(]\\)| s|\n|\\([#)]\\)@\\1| s|$|\\2@g'\''| p }' | tr '\n' ' ' )" # Edit all files containing links to the Git for Windows wiki for f in $(git grep -l git-for-windows/git/wiki) do eval sed -i "$extra" \ -e \''s|\(git-for-windows/git/\)wiki/|\1blob/HEAD/Documentation/git-for-windows/|g'\' \ -e \''s|\(git-for-windows/git/\)wiki|\1blob/HEAD/Documentation/git-for-windows/Home.md|g'\' \ \'"$f"\' done It will need to be repeated in the `build-extra` and `git-for-windows.github.io` repositories. Signed-off-by: Johannes Schindelin <[email protected]>
I have updated the FAQ. Signed-off-by: Johannes Schindelin <[email protected]>
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.
Vandalism of Git for Windows' wiki is not only a disruption, it is annoying and takes a lot of motivation out of this maintainer.
To counter that, here is a proposal to merge the wiki's content into Git for Windows' main repository instead.
Naturally, if we decide to go this route and merge this here PR, we will want to follow up with a merging-rebase that replaces the entire "topic branch" with a single commit. And we would then want to adjust the links that point to the wiki in
build-extra
andgit-for-windows.github.io
and whatever other place we have references to the wiki, too.