git-span 1.1.14 → 1.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/man/git-span.1 +5 -2
- package/package.json +6 -6
package/man/git-span.1
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
.\" GENERATED by gen-manpage. Do not edit by hand.
|
|
2
2
|
.ie \n(.g .ds Aq \(aq
|
|
3
3
|
.el .ds Aq '
|
|
4
|
-
.TH git-span 1 "git-span 1.1.
|
|
4
|
+
.TH git-span 1 "git-span 1.1.17"
|
|
5
5
|
.ie \n(.g .ds Aq \(aq
|
|
6
6
|
.el .ds Aq '
|
|
7
7
|
.SH NAME
|
|
@@ -140,12 +140,15 @@ Show a span\*(Aqs git history as a git\-log\-style timeline: newest\-first commi
|
|
|
140
140
|
git\-span\-resolve(1)
|
|
141
141
|
Settle every residue entry in a conflict\-markered span file under one explicitly chosen side, and write a clean span
|
|
142
142
|
.TP
|
|
143
|
+
git\-span\-config(1)
|
|
144
|
+
Read or set a span\*(Aqs resolver configuration — the span file\*(Aqs trailing `[config]` block
|
|
145
|
+
.TP
|
|
143
146
|
git\-span\-help(1)
|
|
144
147
|
Print this message or the help of the given subcommand(s)
|
|
145
148
|
.ie \n(.g .ds Aq \(aq
|
|
146
149
|
.el .ds Aq '
|
|
147
150
|
.SH VERSION
|
|
148
|
-
v1.1.
|
|
151
|
+
v1.1.17
|
|
149
152
|
.SH EXAMPLES
|
|
150
153
|
Anchor a new span alongside a code change:
|
|
151
154
|
.PP
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "git-span",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.17",
|
|
4
4
|
"bin": "bin/git-span.exe",
|
|
5
5
|
"man": [
|
|
6
6
|
"man/git-span.1"
|
|
@@ -27,11 +27,11 @@
|
|
|
27
27
|
"scripts/postinstall.js"
|
|
28
28
|
],
|
|
29
29
|
"optionalDependencies": {
|
|
30
|
-
"git-span-darwin-arm64": "1.1.
|
|
31
|
-
"git-span-darwin-x64": "1.1.
|
|
32
|
-
"git-span-linux-arm64": "1.1.
|
|
33
|
-
"git-span-linux-x64": "1.1.
|
|
34
|
-
"git-span-win32-x64": "1.1.
|
|
30
|
+
"git-span-darwin-arm64": "1.1.17",
|
|
31
|
+
"git-span-darwin-x64": "1.1.17",
|
|
32
|
+
"git-span-linux-arm64": "1.1.17",
|
|
33
|
+
"git-span-linux-x64": "1.1.17",
|
|
34
|
+
"git-span-win32-x64": "1.1.17"
|
|
35
35
|
},
|
|
36
36
|
"repository": {
|
|
37
37
|
"type": "git",
|