@teambit/harmony.content.cli-reference 1.95.150 → 1.95.151
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/cli-reference.json +6 -1
- package/cli-reference.mdx +2 -1
- package/dist/cli-reference.json +6 -1
- package/dist/cli-reference.mdx.js +14 -1
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1684985676927.js → preview-1685072133537.js} +2 -2
- package/package-tar/teambit-harmony.content.cli-reference-1.95.151.tgz +0 -0
- package/package.json +2 -2
- package/package-tar/teambit-harmony.content.cli-reference-1.95.150.tgz +0 -0
package/cli-reference.json
CHANGED
|
@@ -3109,7 +3109,12 @@
|
|
|
3109
3109
|
[
|
|
3110
3110
|
"",
|
|
3111
3111
|
"no-squash",
|
|
3112
|
-
"
|
|
3112
|
+
"relevant for merging lanes into main, which by default squash"
|
|
3113
|
+
],
|
|
3114
|
+
[
|
|
3115
|
+
"",
|
|
3116
|
+
"squash",
|
|
3117
|
+
"EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash"
|
|
3113
3118
|
],
|
|
3114
3119
|
[
|
|
3115
3120
|
"",
|
package/cli-reference.mdx
CHANGED
|
@@ -899,7 +899,8 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
|
|
|
899
899
|
| `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
|
|
900
900
|
| `--message <message>` | `-m` | override the default message for the auto snap |
|
|
901
901
|
| `--keep-readme` | | skip deleting the lane readme component after merging |
|
|
902
|
-
| `--no-squash` | |
|
|
902
|
+
| `--no-squash` | | relevant for merging lanes into main, which by default squash |
|
|
903
|
+
| `--squash` | | EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash |
|
|
903
904
|
| `--ignore-config-changes` | | allow merging when component are modified due to config changes (such as dependencies) only and not files |
|
|
904
905
|
| `--verbose` | | show details of components that were not merged legitimately |
|
|
905
906
|
| `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
|
package/dist/cli-reference.json
CHANGED
|
@@ -3109,7 +3109,12 @@
|
|
|
3109
3109
|
[
|
|
3110
3110
|
"",
|
|
3111
3111
|
"no-squash",
|
|
3112
|
-
"
|
|
3112
|
+
"relevant for merging lanes into main, which by default squash"
|
|
3113
|
+
],
|
|
3114
|
+
[
|
|
3115
|
+
"",
|
|
3116
|
+
"squash",
|
|
3117
|
+
"EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash"
|
|
3113
3118
|
],
|
|
3114
3119
|
[
|
|
3115
3120
|
"",
|
|
@@ -4111,7 +4111,20 @@ function MDXContent(_ref) {
|
|
|
4111
4111
|
}), (0, _react2.mdx)("td", {
|
|
4112
4112
|
parentName: "tr",
|
|
4113
4113
|
"align": null
|
|
4114
|
-
}, "
|
|
4114
|
+
}, "relevant for merging lanes into main, which by default squash")), (0, _react2.mdx)("tr", {
|
|
4115
|
+
parentName: "tbody"
|
|
4116
|
+
}, (0, _react2.mdx)("td", {
|
|
4117
|
+
parentName: "tr",
|
|
4118
|
+
"align": null
|
|
4119
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
4120
|
+
parentName: "td"
|
|
4121
|
+
}, "--squash")), (0, _react2.mdx)("td", {
|
|
4122
|
+
parentName: "tr",
|
|
4123
|
+
"align": "center"
|
|
4124
|
+
}), (0, _react2.mdx)("td", {
|
|
4125
|
+
parentName: "tr",
|
|
4126
|
+
"align": null
|
|
4127
|
+
}, "EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash")), (0, _react2.mdx)("tr", {
|
|
4115
4128
|
parentName: "tbody"
|
|
4116
4129
|
}, (0, _react2.mdx)("td", {
|
|
4117
4130
|
parentName: "tr",
|