git-span 1.1.1 → 1.1.4
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,6 +1,6 @@
|
|
|
1
1
|
.ie \n(.g .ds Aq \(aq
|
|
2
2
|
.el .ds Aq '
|
|
3
|
-
.TH git-span 1 "git-span 1.1.
|
|
3
|
+
.TH git-span 1 "git-span 1.1.4"
|
|
4
4
|
.ie \n(.g .ds Aq \(aq
|
|
5
5
|
.el .ds Aq '
|
|
6
6
|
.SH NAME
|
|
@@ -131,12 +131,15 @@ Resolve `.span/` merge conflicts structurally when invoked by git as a merge dri
|
|
|
131
131
|
git\-span\-history(1)
|
|
132
132
|
Show a span\*(Aqs git history as a git\-log\-style timeline: newest\-first commit entries whose patches are real unified diffs of the span declaration and of each anchor\*(Aqs content at its declared address, with the span\*(Aqs live drift rendered before the first commit as a headerless diff. That drift is not working\-tree\-only: it covers every resolver layer `git span drift` reports, and each block names its observational layers on a `drift source` line. `HEAD` identifies the comparison layer; it does not by itself prove that the declaration or content change was committed. Source order is the resolver\*(Aqs: line ranges use Worktree → Index → Head, while whole\-file anchors use Index → Worktree → Head
|
|
133
133
|
.TP
|
|
134
|
+
git\-span\-resolve(1)
|
|
135
|
+
Settle every residue entry in a conflict\-markered span file under one explicitly chosen side, and write a clean span
|
|
136
|
+
.TP
|
|
134
137
|
git\-span\-help(1)
|
|
135
138
|
Print this message or the help of the given subcommand(s)
|
|
136
139
|
.ie \n(.g .ds Aq \(aq
|
|
137
140
|
.el .ds Aq '
|
|
138
141
|
.SH VERSION
|
|
139
|
-
v1.1.
|
|
142
|
+
v1.1.4
|
|
140
143
|
.SH EXAMPLES
|
|
141
144
|
Anchor a new span alongside a code change:
|
|
142
145
|
.PP
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "git-span",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.4",
|
|
4
4
|
"bin": "bin/git-span.exe",
|
|
5
5
|
"man": [
|
|
6
6
|
"man/git-span.1"
|
|
@@ -24,11 +24,11 @@
|
|
|
24
24
|
"scripts/postinstall.js"
|
|
25
25
|
],
|
|
26
26
|
"optionalDependencies": {
|
|
27
|
-
"git-span-darwin-arm64": "1.1.
|
|
28
|
-
"git-span-darwin-x64": "1.1.
|
|
29
|
-
"git-span-linux-arm64": "1.1.
|
|
30
|
-
"git-span-linux-x64": "1.1.
|
|
31
|
-
"git-span-win32-x64": "1.1.
|
|
27
|
+
"git-span-darwin-arm64": "1.1.4",
|
|
28
|
+
"git-span-darwin-x64": "1.1.4",
|
|
29
|
+
"git-span-linux-arm64": "1.1.4",
|
|
30
|
+
"git-span-linux-x64": "1.1.4",
|
|
31
|
+
"git-span-win32-x64": "1.1.4"
|
|
32
32
|
},
|
|
33
33
|
"repository": {
|
|
34
34
|
"type": "git",
|