Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dosbox-staging/dosbox-staging.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatryk Obara <dreamer.tan@gmail.com>2021-02-22 16:37:33 +0300
committerGitHub <noreply@github.com>2021-02-22 16:37:33 +0300
commit0f128c068f88bc88ef965f6203ab0de0bd52f05d (patch)
tree8bfa7d0eb93f943447ecb550d8dcb1a6b6cde3b9 /README.md
parent85c0be8e40d958f1d3a01d889c639e8f65af388e (diff)
Update documentation for old branches
Diffstat (limited to 'README.md')
-rw-r--r--README.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/README.md b/README.md
index e1552b84f..71455f4fe 100644
--- a/README.md
+++ b/README.md
@@ -192,21 +192,20 @@ in [BUILD.md]. Links to OS-specific instructions: [MSYS2], [MacPorts],
[MacPorts]: docs/build-macos.md
[Haiku]: docs/build-haiku.md
-## Imported branches and community patches
+## Imported branches, community patches, old forks
Commits landing in SVN upstream are imported to this repo in a timely manner,
-to the branches matching [`svn/*`] pattern, e.g. [`svn/trunk`].
+see branch [`svn/trunk`].
-Other branch name patterns are also in use: [`vogons/*`] for various
-patches posted on the Vogons forum, [`munt/*`] for patches from the Munt
-project, etc.
+- [`svn/*`] - branches from SVN
+- [`forks/*`] - code for various abandoned DOSBox forks
+- [`vogons/*`] - community patches posted on the Vogons forum
Git tags matching pattern `svn/*` are pointing to the commits referenced by SVN
"tag" paths at the time of creation.
-Additionally, we attach some optional metadata to the commits imported from SVN
-in the form of [Git notes](https://git-scm.com/docs/git-notes). To fetch them,
-run:
+Additionally, we attach some optional metadata to the commits in the form of
+[Git notes][git-notes]. To fetch them, run:
``` shell
git fetch origin "refs/notes/*:refs/notes/*"
@@ -219,4 +218,5 @@ For some historical context of why this repo exists you can read
[`svn/*`]: https://github.com/dosbox-staging/dosbox-staging/branches/all?utf8=%E2%9C%93&query=svn%2F
[`svn/trunk`]: https://github.com/dosbox-staging/dosbox-staging/tree/svn/trunk
[`vogons/*`]: https://github.com/dosbox-staging/dosbox-staging/branches/all?utf8=%E2%9C%93&query=vogons%2F
-[`munt/*`]: https://github.com/dosbox-staging/dosbox-staging/branches/all?utf8=%E2%9C%93&query=munt%2F
+[`forks/*`]: https://github.com/dosbox-staging/dosbox-staging/branches/all?utf8=%E2%9C%93&query=forks%2F
+[git-notes]: https://git-scm.com/docs/git-notes