Skip to content

Commit 69cd214

Browse files
committed
Merge branch 'reorg'
2 parents 47bedfe + 995b27f commit 69cd214

File tree

182 files changed

+4189
-4601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+4189
-4601
lines changed

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@
1616
bin
1717
multi.json
1818
multi.ignore
19-
coverage.txt
19+
coverage.txt
20+
.multi
21+
.multiverse
22+
.DS_Store

ArchLinux/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ package(){
4141
make install GOBIN=${pkgdir}/usr/bin
4242
mkdir -p ${pkgdir}/var/lib/multi/
4343
chown 5000:5000 ${pkgdir}/var/lib/multi
44-
install -Dm644 ${srcdir}/${pkgname}/misc/multiverse.service ${pkgdir}/usr/lib/systemd/system/multiverse.service
45-
install -Dm644 ${srcdir}/${pkgname}/misc/multi-user.conf ${pkgdir}/usr/lib/sysusers.d/multi.conf
44+
install -Dm644 ${srcdir}/${pkgname}/init/multiverse.service ${pkgdir}/usr/lib/systemd/system/multiverse.service
45+
install -Dm644 ${srcdir}/${pkgname}/init/multi-user.conf ${pkgdir}/usr/lib/sysusers.d/multi.conf
4646
}

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GOCC = go1.16
1+
GOCC = go
22

33
.PHONY: multi install test multi-cross
44
.PHONY: multi-darwin multi-darwin-386 multi-darwin-amd64
@@ -15,7 +15,7 @@ install:
1515

1616
install-systemd: install
1717
mkdir -p $(HOME)/.config/systemd/user/
18-
cp misc/multiverse-user.service $(HOME)/.config/systemd/user
18+
cp ./init/multiverse-user.service $(HOME)/.config/systemd/user
1919

2020
test:
2121
$(GOCC) test ./... -cover

README.md

+4-31
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Multiverse
22

33
[![Gitter](https://badges.gitter.im/multiverse-vcs/community.svg)](https://gitter.im/multiverse-vcs/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
4-
[![Go Report Card](https://goreportcard.com/badge/github.com/multiverse-vcs/go-multiverse)](https://goreportcard.com/report/github.com/multiverse-vcs/go-multiverse)
54
[![codecov](https://codecov.io/gh/multiverse-vcs/go-multiverse/branch/master/graph/badge.svg?token=Y6UBYBD56P)](https://codecov.io/gh/multiverse-vcs/go-multiverse)
65

76
> A decentralized version control system for peer-to-peer software development.
@@ -10,50 +9,24 @@
109

1110
### Features
1211

13-
- ***Peer-to-peer*** - self host your repositories
14-
- ***Works offline*** - integrated local code viewer
15-
- ***Secure*** - all communications are encrypted
12+
- Self host your repositories. No server setup required.
13+
- Internet connection optional. Works on your local area network.
14+
- Private by default. Remain anonymous or use a custom handle.
1615

1716
### Getting Started
1817

19-
[Read the manual](https://www.multiverse-vcs.com/docs/).
18+
[Read the manual](docs/getting-started.md).
2019

2120
### Building
2221

2322
Go 1.16 or higher is required.
2423

25-
```bash
26-
$ go get golang.org/dl/go1.16
27-
$ go1.16 download
28-
```
29-
30-
Build and install from sources.
31-
3224
```bash
3325
$ git clone https://github.com/multiverse-vcs/go-multiverse.git
3426
$ cd go-multiverse
3527
$ make install
3628
```
3729

38-
### Usage
39-
40-
```
41-
USAGE:
42-
multi [global options] command [command options] [arguments...]
43-
44-
COMMANDS:
45-
branch List, create, or delete branches
46-
commit Record changes
47-
daemon Starts a client
48-
import Import a repo
49-
init Create a repo
50-
log Print repo history
51-
merge Merge commits
52-
status Print changes
53-
tag List, create, or delete tags
54-
help, h Shows a list of commands or help for one command
55-
```
56-
5730
### Contributing
5831

5932
Found a bug or have a feature request? [Open an issue](https://github.com/multiverse-vcs/go-multiverse/issues/new).

cmd/multi/branch.go

-77
This file was deleted.

cmd/multi/checkout.go

-58
This file was deleted.

cmd/multi/clone.go

-73
This file was deleted.

cmd/multi/commit.go

-60
This file was deleted.

0 commit comments

Comments
 (0)