Skip to content

Commit 6092555

Browse files
author
Brandon Sneed
committed
Updated man pages.
1 parent 65525e1 commit 6092555

File tree

8 files changed

+39
-19
lines changed

8 files changed

+39
-19
lines changed

Documentation/modulo-add.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "MODULO\-ADD" "1" "January 2017" "Modulo" "Modulo manual"
4+
.TH "MODULO\-ADD" "1" "June 2017" "Modulo" "Modulo manual"
55
.
66
.SH "NAME"
77
\fBmodulo\-add\fR \- Initialize a project for use with Modulo\.

Documentation/modulo-add.1.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,33 @@ modulo-add(1) -- Initialize a project for use with Modulo.
44
## SYNOPSIS
55

66
`modulo add` [-u] <repo_url><br />
7-
`modulo add` --version [-u] <semver> <repo_url><br />
8-
`modulo add` --unmanaged [-u] <repo_url><br />
7+
`modulo add` --tag [-u] <semver> <repo_url><br />
8+
`modulo add` --branch [-u] <branchname> <repo_url><br />
9+
`modulo add` --commit [-u] <commithash> <repo_url><br />
910

1011
## DESCRIPTION
1112

12-
This command adds a dependency to the current project.
13+
This command adds a dependency to the current project. When no tag/branch/commit is specified, `origin/master` is assumed.
1314

1415
No cloning of dependencies, etc. takes place here unless `--update` is specified.
1516

17+
Any dependencies that are cloned (even branches) are in a detached-head state. This forces the same workflow to be used regardless of the checkout type.
18+
1619
## OPTIONS
1720

18-
* `--version` <semver>:
21+
* `--tag` <semver>:
1922
This option specifies that a semver tag or range should be checked out. Modulo treats semver as `breaking.feature.fix` since that is more meaningful to most.
2023

2124
Modulo's semver implementation follows the `npm` implementation very closely. To read more, visit:
2225

2326
https://docs.npmjs.com/getting-started/semantic-versioning
2427

25-
* `--unmanaged`:
26-
This informs modulo that the user will manage branches/commits/tags on their own. When updating, only a pull from the remote is performed.
28+
* `--branch` <branchname>:
29+
Specify the branch desired on checkedout.
30+
It's preferrable to specify the remote, ie: `origin/mybranch`. If omitted, `origin` will be the assumed remote.'
31+
32+
* `--commit` <commithash>:
33+
Specify the commit hash to be used on checkout. This accepts both short and long hashes.
2734

2835
* `-u, --update`:
2936
Immediately perform an `update` after adding the dependency. This will clone if necessary, as well as perform any dependency compatibility checks.
@@ -36,18 +43,18 @@ No cloning of dependencies, etc. takes place here unless `--update` is specified
3643

3744
## EXAMPLES
3845

39-
`modulo add --version ">=1.1 < 2.0.0" --update git@github.com/something/yadda.git`
46+
`modulo add --tag ">=1.1 < 2.0.0" --update git@github.com/something/yadda.git`
4047

4148
This will do the following<br />
4249
* Add yadda.git as a dependency.<br />
4350
* Clone yadda.git, because --update was specified.<br />
4451
* Checkout the latest tag that is greater than or equal to 1.1.0, but less than 2.0.0<br />
4552

46-
`modulo add --unmanaged git@github.com/something/yadda.git`
53+
`modulo add --branch master git@github.com/something/yadda.git`
4754

4855
This will<br />
4956
* Add yadda.git as a dependency.<br />
50-
* Record that when performing update, this module is unmanaged, thus only doing a pull operation.<br />
57+
* Record that when performing update, the branch `origin/master` is to be checked out.<br />
5158

5259
## SEE ALSO
5360

Documentation/modulo-init.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "MODULO\-INIT" "1" "January 2017" "Modulo" "Modulo manual"
4+
.TH "MODULO\-INIT" "1" "June 2017" "Modulo" "Modulo manual"
55
.
66
.SH "NAME"
77
\fBmodulo\-init\fR \- Initialize a project for use with Modulo\.

Documentation/modulo-init.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This command initializes a project/directory for use with Modulo. A `.modulo` f
1313
## OPTIONS
1414

1515
* `--app`:
16-
Initializes modulo as an application. Any dependencies will be located in `.\modules` upon add/update.
16+
Initializes modulo as an application. Any dependencies will be located in `.\modules` upon add/update. This option also adds an entry to SCM's ignore file to ignore the `modules` directory.
1717

1818
* `--module`:
1919
Initializes modulo as an module. Any dependencies will be located in `..\` upon add/update.

Documentation/modulo-layout.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "MODULO\-LAYOUT" "1" "January 2017" "Modulo" "Modulo manual"
4+
.TH "MODULO\-LAYOUT" "1" "June 2017" "Modulo" "Modulo manual"
55
.
66
.SH "NAME"
77
\fBmodulo\-layout\fR \- Explains the file system layout

Documentation/modulo-update.1

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "MODULO\-UPDATE" "1" "January 2017" "Modulo" "Modulo manual"
4+
.TH "MODULO\-UPDATE" "1" "June 2017" "Modulo" "Modulo manual"
55
.
66
.SH "NAME"
77
\fBmodulo\-update\fR \- Update the project based on the current set of dependencies\.
@@ -42,6 +42,10 @@ This will iterate through all dependencies and perform an update\.
4242
Instructs Modulo to just perform an update on the specified dependency\. See \fBmap\fR for a list of dependencies\.
4343
.
4444
.TP
45+
\fB\-\-meh\fR
46+
Update will perform a no\-op if modulo isn\'t being used on this project\. Useful for build system integration\.
47+
.
48+
.TP
4549
\fB\-v, \-\-verbose\fR
4650
Prints verbose output\. Use this to see what underlying SCM commands are being used and any other important information\.
4751
.
@@ -56,4 +60,10 @@ modulo\-layout(1), modulo\-map(1)
5660
Report bugs to the Github Project located at https://github\.com/modulo\-dm/modulo/\. You\'ll be able to see the status and track any issues you create\.
5761
.
5862
.SH "AUTHORS"
59-
Brandon Sneed \fIbrandon@redf\.net\fR Peat Bakke \fIpeat@peat\.org\fR
63+
Brandon Sneed \fIbrandon@redf\.net\fR
64+
.
65+
.br
66+
Peat Bakke \fIpeat@peat\.org\fR
67+
.
68+
.br
69+

Documentation/modulo-update.1.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ This command updates any previously specified dependencies. Updates can consist
2020
* `--all`:
2121
This will iterate through all dependencies and perform an update.
2222

23-
* `<dependencyname>`:
23+
* <dependencyname>:
2424
Instructs Modulo to just perform an update on the specified dependency. See `map` for a list of dependencies.
2525

26+
* `--meh`:
27+
Update will perform a no-op if modulo isn't being used on this project. Useful for build system integration.
28+
2629
* `-v, --verbose`:
2730
Prints verbose output. Use this to see what underlying SCM commands are being used and any other important information.
2831

@@ -39,7 +42,7 @@ Report bugs to the Github Project located at https://github.com/modulo-dm/modulo
3942

4043
## AUTHORS
4144

42-
Brandon Sneed <brandon@redf.net>
43-
Peat Bakke <peat@peat.org>
45+
Brandon Sneed <brandon@redf.net><br />
46+
Peat Bakke <peat@peat.org><br />
4447

4548

Documentation/modulo.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" generated with Ronn/v0.7.3
22
.\" http://github.com/rtomayko/ronn/tree/0.7.3
33
.
4-
.TH "MODULO" "1" "January 2017" "Modulo" "Modulo manual"
4+
.TH "MODULO" "1" "June 2017" "Modulo" "Modulo manual"
55
.
66
.SH "NAME"
77
\fBmodulo\fR \- A source\-only dependency manager

0 commit comments

Comments
 (0)