@teambit/harmony.content.cli-reference 2.0.1054 → 2.0.1055
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.docs.mdx +1 -1
- package/cli-reference.json +12 -2
- package/cli-reference.mdx +2 -1
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +12 -2
- package/dist/cli-reference.mdx.js +1 -1
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1779305522985.js → preview-1779311726596.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -4032,7 +4032,12 @@
|
|
|
4032
4032
|
[
|
|
4033
4033
|
"h",
|
|
4034
4034
|
"head",
|
|
4035
|
-
"
|
|
4035
|
+
"DEPRECATED. this is currently the default behavior"
|
|
4036
|
+
],
|
|
4037
|
+
[
|
|
4038
|
+
"",
|
|
4039
|
+
"skip-fetch",
|
|
4040
|
+
"don't fetch the latest from the remote; switch to the lane/main state already in the local scope"
|
|
4036
4041
|
],
|
|
4037
4042
|
[
|
|
4038
4043
|
"r",
|
|
@@ -4659,7 +4664,12 @@
|
|
|
4659
4664
|
[
|
|
4660
4665
|
"h",
|
|
4661
4666
|
"head",
|
|
4662
|
-
"
|
|
4667
|
+
"DEPRECATED. this is currently the default behavior"
|
|
4668
|
+
],
|
|
4669
|
+
[
|
|
4670
|
+
"",
|
|
4671
|
+
"skip-fetch",
|
|
4672
|
+
"don't fetch the latest from the remote; switch to the lane/main state already in the local scope"
|
|
4663
4673
|
],
|
|
4664
4674
|
[
|
|
4665
4675
|
"r",
|
package/cli-reference.mdx
CHANGED
|
@@ -1287,7 +1287,8 @@ without a sub-command, lists all available lanes.
|
|
|
1287
1287
|
|
|
1288
1288
|
| **Option** | **Option alias** | **Description** |
|
|
1289
1289
|
| --------------------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
1290
|
-
| `--head` | `-h` |
|
|
1290
|
+
| `--head` | `-h` | DEPRECATED. this is currently the default behavior |
|
|
1291
|
+
| `--skip-fetch` | | don't fetch the latest from the remote; switch to the lane/main state already in the local scope |
|
|
1291
1292
|
| `--auto-merge-resolve <merge-strategy>` | `-r` | merge local changes with the checked out version. strategy should be "theirs", "ours" or "manual" |
|
|
1292
1293
|
| `--force-ours` | | do not merge, preserve local files as is |
|
|
1293
1294
|
| `--force-theirs` | | do not merge, just overwrite with incoming files |
|
package/dist/cli-reference.json
CHANGED
|
@@ -4032,7 +4032,12 @@
|
|
|
4032
4032
|
[
|
|
4033
4033
|
"h",
|
|
4034
4034
|
"head",
|
|
4035
|
-
"
|
|
4035
|
+
"DEPRECATED. this is currently the default behavior"
|
|
4036
|
+
],
|
|
4037
|
+
[
|
|
4038
|
+
"",
|
|
4039
|
+
"skip-fetch",
|
|
4040
|
+
"don't fetch the latest from the remote; switch to the lane/main state already in the local scope"
|
|
4036
4041
|
],
|
|
4037
4042
|
[
|
|
4038
4043
|
"r",
|
|
@@ -4659,7 +4664,12 @@
|
|
|
4659
4664
|
[
|
|
4660
4665
|
"h",
|
|
4661
4666
|
"head",
|
|
4662
|
-
"
|
|
4667
|
+
"DEPRECATED. this is currently the default behavior"
|
|
4668
|
+
],
|
|
4669
|
+
[
|
|
4670
|
+
"",
|
|
4671
|
+
"skip-fetch",
|
|
4672
|
+
"don't fetch the latest from the remote; switch to the lane/main state already in the local scope"
|
|
4663
4673
|
],
|
|
4664
4674
|
[
|
|
4665
4675
|
"r",
|