@teambit/harmony.content.cli-reference 1.95.178 → 1.95.180
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 +89 -53
- package/cli-reference.mdx +20 -1
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +89 -53
- package/dist/cli-reference.mdx.js +128 -4
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1689736586631.js → preview-1689909446382.js} +2 -2
- package/package-tar/teambit-harmony.content.cli-reference-1.95.180.tgz +0 -0
- package/package.json +2 -2
- package/package-tar/teambit-harmony.content.cli-reference-1.95.178.tgz +0 -0
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -690,21 +690,6 @@
|
|
|
690
690
|
}
|
|
691
691
|
]
|
|
692
692
|
},
|
|
693
|
-
{
|
|
694
|
-
"name": "component-issues",
|
|
695
|
-
"alias": "",
|
|
696
|
-
"options": [
|
|
697
|
-
[
|
|
698
|
-
"j",
|
|
699
|
-
"json",
|
|
700
|
-
"json format"
|
|
701
|
-
]
|
|
702
|
-
],
|
|
703
|
-
"description": "list available component-issues",
|
|
704
|
-
"extendedDescription": "",
|
|
705
|
-
"group": "development",
|
|
706
|
-
"private": true
|
|
707
|
-
},
|
|
708
693
|
{
|
|
709
694
|
"name": "show <component-name>",
|
|
710
695
|
"alias": "",
|
|
@@ -741,6 +726,21 @@
|
|
|
741
726
|
}
|
|
742
727
|
]
|
|
743
728
|
},
|
|
729
|
+
{
|
|
730
|
+
"name": "component-issues",
|
|
731
|
+
"alias": "",
|
|
732
|
+
"options": [
|
|
733
|
+
[
|
|
734
|
+
"j",
|
|
735
|
+
"json",
|
|
736
|
+
"json format"
|
|
737
|
+
]
|
|
738
|
+
],
|
|
739
|
+
"description": "list available component-issues",
|
|
740
|
+
"extendedDescription": "",
|
|
741
|
+
"group": "development",
|
|
742
|
+
"private": true
|
|
743
|
+
},
|
|
744
744
|
{
|
|
745
745
|
"name": "envs",
|
|
746
746
|
"alias": "env",
|
|
@@ -877,6 +877,42 @@
|
|
|
877
877
|
}
|
|
878
878
|
]
|
|
879
879
|
},
|
|
880
|
+
{
|
|
881
|
+
"name": "graph [id]",
|
|
882
|
+
"alias": "",
|
|
883
|
+
"options": [
|
|
884
|
+
[
|
|
885
|
+
"i",
|
|
886
|
+
"image <image>",
|
|
887
|
+
"image path. use one of the following extensions: [gif, png, svg, pdf]"
|
|
888
|
+
],
|
|
889
|
+
[
|
|
890
|
+
"r",
|
|
891
|
+
"remote [remoteName]",
|
|
892
|
+
"remote name (name is optional, leave empty when id is specified)"
|
|
893
|
+
],
|
|
894
|
+
[
|
|
895
|
+
"",
|
|
896
|
+
"all-versions",
|
|
897
|
+
"enter all components versions into the graph, not only latest"
|
|
898
|
+
],
|
|
899
|
+
[
|
|
900
|
+
"",
|
|
901
|
+
"layout <name>",
|
|
902
|
+
"GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
|
|
903
|
+
],
|
|
904
|
+
[
|
|
905
|
+
"j",
|
|
906
|
+
"json",
|
|
907
|
+
"json format"
|
|
908
|
+
]
|
|
909
|
+
],
|
|
910
|
+
"description": "generate an image file with the dependencies graph",
|
|
911
|
+
"extendedDescription": "",
|
|
912
|
+
"group": "discover",
|
|
913
|
+
"private": false,
|
|
914
|
+
"remoteOp": true
|
|
915
|
+
},
|
|
880
916
|
{
|
|
881
917
|
"name": "start [component-pattern]",
|
|
882
918
|
"alias": "c",
|
|
@@ -942,42 +978,6 @@
|
|
|
942
978
|
"group": "development",
|
|
943
979
|
"private": true
|
|
944
980
|
},
|
|
945
|
-
{
|
|
946
|
-
"name": "graph [id]",
|
|
947
|
-
"alias": "",
|
|
948
|
-
"options": [
|
|
949
|
-
[
|
|
950
|
-
"i",
|
|
951
|
-
"image <image>",
|
|
952
|
-
"image path. use one of the following extensions: [gif, png, svg, pdf]"
|
|
953
|
-
],
|
|
954
|
-
[
|
|
955
|
-
"r",
|
|
956
|
-
"remote [remoteName]",
|
|
957
|
-
"remote name (name is optional, leave empty when id is specified)"
|
|
958
|
-
],
|
|
959
|
-
[
|
|
960
|
-
"",
|
|
961
|
-
"all-versions",
|
|
962
|
-
"enter all components versions into the graph, not only latest"
|
|
963
|
-
],
|
|
964
|
-
[
|
|
965
|
-
"",
|
|
966
|
-
"layout <name>",
|
|
967
|
-
"GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
|
|
968
|
-
],
|
|
969
|
-
[
|
|
970
|
-
"j",
|
|
971
|
-
"json",
|
|
972
|
-
"json format"
|
|
973
|
-
]
|
|
974
|
-
],
|
|
975
|
-
"description": "generate an image file with the dependencies graph",
|
|
976
|
-
"extendedDescription": "",
|
|
977
|
-
"group": "discover",
|
|
978
|
-
"private": false,
|
|
979
|
-
"remoteOp": true
|
|
980
|
-
},
|
|
981
981
|
{
|
|
982
982
|
"name": "scope <sub-command>",
|
|
983
983
|
"alias": "",
|
|
@@ -2844,7 +2844,7 @@
|
|
|
2844
2844
|
]
|
|
2845
2845
|
],
|
|
2846
2846
|
"description": "merge changes of the remote head into local",
|
|
2847
|
-
"extendedDescription": "merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge
|
|
2847
|
+
"extendedDescription": "merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\nyou can use a pattern for multiple ids, such as bit merge \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
|
|
2848
2848
|
"group": "development",
|
|
2849
2849
|
"private": false
|
|
2850
2850
|
},
|
|
@@ -3287,6 +3287,31 @@
|
|
|
3287
3287
|
"description": "partially merge the lane with the specified component-pattern"
|
|
3288
3288
|
}
|
|
3289
3289
|
]
|
|
3290
|
+
},
|
|
3291
|
+
{
|
|
3292
|
+
"name": "merge-abort",
|
|
3293
|
+
"alias": "",
|
|
3294
|
+
"options": [
|
|
3295
|
+
[
|
|
3296
|
+
"",
|
|
3297
|
+
"verbose",
|
|
3298
|
+
"show details of components that were not merged legitimately"
|
|
3299
|
+
],
|
|
3300
|
+
[
|
|
3301
|
+
"s",
|
|
3302
|
+
"silent",
|
|
3303
|
+
"skip confirmation"
|
|
3304
|
+
],
|
|
3305
|
+
[
|
|
3306
|
+
"x",
|
|
3307
|
+
"skip-dependency-installation",
|
|
3308
|
+
"do not install packages of the imported components"
|
|
3309
|
+
]
|
|
3310
|
+
],
|
|
3311
|
+
"description": "abort the recent lane-merge. revert the lane object and checkout accordingly",
|
|
3312
|
+
"extendedDescription": "restore the lane-object same as it was before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane",
|
|
3313
|
+
"private": true,
|
|
3314
|
+
"remoteOp": true
|
|
3290
3315
|
}
|
|
3291
3316
|
]
|
|
3292
3317
|
},
|
|
@@ -3740,7 +3765,18 @@
|
|
|
3740
3765
|
{
|
|
3741
3766
|
"name": "mini-status [component-pattern]",
|
|
3742
3767
|
"alias": "ms",
|
|
3743
|
-
"options": [
|
|
3768
|
+
"options": [
|
|
3769
|
+
[
|
|
3770
|
+
"",
|
|
3771
|
+
"show-issues",
|
|
3772
|
+
"show component issues (slows down the command)"
|
|
3773
|
+
],
|
|
3774
|
+
[
|
|
3775
|
+
"j",
|
|
3776
|
+
"json",
|
|
3777
|
+
"json format"
|
|
3778
|
+
]
|
|
3779
|
+
],
|
|
3744
3780
|
"description": "EXPERIMENTAL. basic status for fast execution",
|
|
3745
3781
|
"extendedDescription": "shows only modified/new components. for the full status, use \"bit status\".\nthe modified are components that their source code have changed, it doesn't check for config/aspect changes",
|
|
3746
3782
|
"group": "development",
|
package/cli-reference.mdx
CHANGED
|
@@ -957,6 +957,20 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
|
|
|
957
957
|
| `--include-deps` | | relevant for "--pattern" and "--workspace". merge also dependencies of the given components |
|
|
958
958
|
| `--resolve-unrelated [merge-strategy]` | | relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs" |
|
|
959
959
|
|
|
960
|
+
### lane merge-abort
|
|
961
|
+
|
|
962
|
+
**Usage**: `lane merge-abort`
|
|
963
|
+
|
|
964
|
+
**Description**: abort the recent lane-merge. revert the lane object and checkout accordingly
|
|
965
|
+
restore the lane-object same as it was before the last "bit lane merge" command.
|
|
966
|
+
also, checkout the workspace components according to the restored lane
|
|
967
|
+
|
|
968
|
+
| **Option** | **Option alias** | **Description** |
|
|
969
|
+
| -------------------------------- | :--------------: | ------------------------------------------------------------ |
|
|
970
|
+
| `--verbose` | | show details of components that were not merged legitimately |
|
|
971
|
+
| `--silent` | `-s` | skip confirmation |
|
|
972
|
+
| `--skip-dependency-installation` | `-x` | do not install packages of the imported components |
|
|
973
|
+
|
|
960
974
|
| **Option** | **Option alias** | **Description** |
|
|
961
975
|
| ------------------- | :--------------: | ------------------------------------------------------------- |
|
|
962
976
|
| `--details` | `-d` | show more details on the state of each component in each lane |
|
|
@@ -1073,7 +1087,7 @@ https://bit.dev/docs/reference/cli-reference#list
|
|
|
1073
1087
|
**Description**: merge changes of the remote head into local
|
|
1074
1088
|
merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.
|
|
1075
1089
|
if no ids are specified, all pending-merge components will be merged. (run "bit status" to list them).
|
|
1076
|
-
optionally use '--abort' to revert the last merge
|
|
1090
|
+
optionally use '--abort' to revert the last merge. to revert a lane merge, use "bit lane merge-abort" command.
|
|
1077
1091
|
you can use a pattern for multiple ids, such as bit merge "utils/\*". (wrap the pattern with quotes to avoid collision with shell commands)
|
|
1078
1092
|
|
|
1079
1093
|
`bit merge [ids...]`
|
|
@@ -1102,6 +1116,11 @@ the modified are components that their source code have changed, it doesn't chec
|
|
|
1102
1116
|
|
|
1103
1117
|
`bit mini-status [component-pattern]`
|
|
1104
1118
|
|
|
1119
|
+
| **Option** | **Option alias** | **Description** |
|
|
1120
|
+
| --------------- | :--------------: | ---------------------------------------------- |
|
|
1121
|
+
| `--show-issues` | | show component issues (slows down the command) |
|
|
1122
|
+
| `--json` | `-j` | json format |
|
|
1123
|
+
|
|
1105
1124
|
---
|
|
1106
1125
|
|
|
1107
1126
|
## move
|
package/dist/cli-reference.json
CHANGED
|
@@ -690,21 +690,6 @@
|
|
|
690
690
|
}
|
|
691
691
|
]
|
|
692
692
|
},
|
|
693
|
-
{
|
|
694
|
-
"name": "component-issues",
|
|
695
|
-
"alias": "",
|
|
696
|
-
"options": [
|
|
697
|
-
[
|
|
698
|
-
"j",
|
|
699
|
-
"json",
|
|
700
|
-
"json format"
|
|
701
|
-
]
|
|
702
|
-
],
|
|
703
|
-
"description": "list available component-issues",
|
|
704
|
-
"extendedDescription": "",
|
|
705
|
-
"group": "development",
|
|
706
|
-
"private": true
|
|
707
|
-
},
|
|
708
693
|
{
|
|
709
694
|
"name": "show <component-name>",
|
|
710
695
|
"alias": "",
|
|
@@ -741,6 +726,21 @@
|
|
|
741
726
|
}
|
|
742
727
|
]
|
|
743
728
|
},
|
|
729
|
+
{
|
|
730
|
+
"name": "component-issues",
|
|
731
|
+
"alias": "",
|
|
732
|
+
"options": [
|
|
733
|
+
[
|
|
734
|
+
"j",
|
|
735
|
+
"json",
|
|
736
|
+
"json format"
|
|
737
|
+
]
|
|
738
|
+
],
|
|
739
|
+
"description": "list available component-issues",
|
|
740
|
+
"extendedDescription": "",
|
|
741
|
+
"group": "development",
|
|
742
|
+
"private": true
|
|
743
|
+
},
|
|
744
744
|
{
|
|
745
745
|
"name": "envs",
|
|
746
746
|
"alias": "env",
|
|
@@ -877,6 +877,42 @@
|
|
|
877
877
|
}
|
|
878
878
|
]
|
|
879
879
|
},
|
|
880
|
+
{
|
|
881
|
+
"name": "graph [id]",
|
|
882
|
+
"alias": "",
|
|
883
|
+
"options": [
|
|
884
|
+
[
|
|
885
|
+
"i",
|
|
886
|
+
"image <image>",
|
|
887
|
+
"image path. use one of the following extensions: [gif, png, svg, pdf]"
|
|
888
|
+
],
|
|
889
|
+
[
|
|
890
|
+
"r",
|
|
891
|
+
"remote [remoteName]",
|
|
892
|
+
"remote name (name is optional, leave empty when id is specified)"
|
|
893
|
+
],
|
|
894
|
+
[
|
|
895
|
+
"",
|
|
896
|
+
"all-versions",
|
|
897
|
+
"enter all components versions into the graph, not only latest"
|
|
898
|
+
],
|
|
899
|
+
[
|
|
900
|
+
"",
|
|
901
|
+
"layout <name>",
|
|
902
|
+
"GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
|
|
903
|
+
],
|
|
904
|
+
[
|
|
905
|
+
"j",
|
|
906
|
+
"json",
|
|
907
|
+
"json format"
|
|
908
|
+
]
|
|
909
|
+
],
|
|
910
|
+
"description": "generate an image file with the dependencies graph",
|
|
911
|
+
"extendedDescription": "",
|
|
912
|
+
"group": "discover",
|
|
913
|
+
"private": false,
|
|
914
|
+
"remoteOp": true
|
|
915
|
+
},
|
|
880
916
|
{
|
|
881
917
|
"name": "start [component-pattern]",
|
|
882
918
|
"alias": "c",
|
|
@@ -942,42 +978,6 @@
|
|
|
942
978
|
"group": "development",
|
|
943
979
|
"private": true
|
|
944
980
|
},
|
|
945
|
-
{
|
|
946
|
-
"name": "graph [id]",
|
|
947
|
-
"alias": "",
|
|
948
|
-
"options": [
|
|
949
|
-
[
|
|
950
|
-
"i",
|
|
951
|
-
"image <image>",
|
|
952
|
-
"image path. use one of the following extensions: [gif, png, svg, pdf]"
|
|
953
|
-
],
|
|
954
|
-
[
|
|
955
|
-
"r",
|
|
956
|
-
"remote [remoteName]",
|
|
957
|
-
"remote name (name is optional, leave empty when id is specified)"
|
|
958
|
-
],
|
|
959
|
-
[
|
|
960
|
-
"",
|
|
961
|
-
"all-versions",
|
|
962
|
-
"enter all components versions into the graph, not only latest"
|
|
963
|
-
],
|
|
964
|
-
[
|
|
965
|
-
"",
|
|
966
|
-
"layout <name>",
|
|
967
|
-
"GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
|
|
968
|
-
],
|
|
969
|
-
[
|
|
970
|
-
"j",
|
|
971
|
-
"json",
|
|
972
|
-
"json format"
|
|
973
|
-
]
|
|
974
|
-
],
|
|
975
|
-
"description": "generate an image file with the dependencies graph",
|
|
976
|
-
"extendedDescription": "",
|
|
977
|
-
"group": "discover",
|
|
978
|
-
"private": false,
|
|
979
|
-
"remoteOp": true
|
|
980
|
-
},
|
|
981
981
|
{
|
|
982
982
|
"name": "scope <sub-command>",
|
|
983
983
|
"alias": "",
|
|
@@ -2844,7 +2844,7 @@
|
|
|
2844
2844
|
]
|
|
2845
2845
|
],
|
|
2846
2846
|
"description": "merge changes of the remote head into local",
|
|
2847
|
-
"extendedDescription": "merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge
|
|
2847
|
+
"extendedDescription": "merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\nyou can use a pattern for multiple ids, such as bit merge \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
|
|
2848
2848
|
"group": "development",
|
|
2849
2849
|
"private": false
|
|
2850
2850
|
},
|
|
@@ -3287,6 +3287,31 @@
|
|
|
3287
3287
|
"description": "partially merge the lane with the specified component-pattern"
|
|
3288
3288
|
}
|
|
3289
3289
|
]
|
|
3290
|
+
},
|
|
3291
|
+
{
|
|
3292
|
+
"name": "merge-abort",
|
|
3293
|
+
"alias": "",
|
|
3294
|
+
"options": [
|
|
3295
|
+
[
|
|
3296
|
+
"",
|
|
3297
|
+
"verbose",
|
|
3298
|
+
"show details of components that were not merged legitimately"
|
|
3299
|
+
],
|
|
3300
|
+
[
|
|
3301
|
+
"s",
|
|
3302
|
+
"silent",
|
|
3303
|
+
"skip confirmation"
|
|
3304
|
+
],
|
|
3305
|
+
[
|
|
3306
|
+
"x",
|
|
3307
|
+
"skip-dependency-installation",
|
|
3308
|
+
"do not install packages of the imported components"
|
|
3309
|
+
]
|
|
3310
|
+
],
|
|
3311
|
+
"description": "abort the recent lane-merge. revert the lane object and checkout accordingly",
|
|
3312
|
+
"extendedDescription": "restore the lane-object same as it was before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane",
|
|
3313
|
+
"private": true,
|
|
3314
|
+
"remoteOp": true
|
|
3290
3315
|
}
|
|
3291
3316
|
]
|
|
3292
3317
|
},
|
|
@@ -3740,7 +3765,18 @@
|
|
|
3740
3765
|
{
|
|
3741
3766
|
"name": "mini-status [component-pattern]",
|
|
3742
3767
|
"alias": "ms",
|
|
3743
|
-
"options": [
|
|
3768
|
+
"options": [
|
|
3769
|
+
[
|
|
3770
|
+
"",
|
|
3771
|
+
"show-issues",
|
|
3772
|
+
"show component issues (slows down the command)"
|
|
3773
|
+
],
|
|
3774
|
+
[
|
|
3775
|
+
"j",
|
|
3776
|
+
"json",
|
|
3777
|
+
"json format"
|
|
3778
|
+
]
|
|
3779
|
+
],
|
|
3744
3780
|
"description": "EXPERIMENTAL. basic status for fast execution",
|
|
3745
3781
|
"extendedDescription": "shows only modified/new components. for the full status, use \"bit status\".\nthe modified are components that their source code have changed, it doesn't check for config/aspect changes",
|
|
3746
3782
|
"group": "development",
|
|
@@ -6,13 +6,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = MDXContent;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _react2 = require("@mdx-js/react");
|
|
9
|
-
var _excluded = ["components"];
|
|
9
|
+
var _excluded = ["components"];
|
|
10
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
11
11
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
12
12
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
13
13
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
14
14
|
/* @jsxRuntime classic */
|
|
15
15
|
/* @jsx mdx */
|
|
16
|
+
|
|
16
17
|
var layoutProps = {};
|
|
17
18
|
var MDXLayout = "wrapper";
|
|
18
19
|
function MDXContent(_ref) {
|
|
@@ -4434,7 +4435,81 @@ function MDXContent(_ref) {
|
|
|
4434
4435
|
}), (0, _react2.mdx)("td", {
|
|
4435
4436
|
parentName: "tr",
|
|
4436
4437
|
"align": null
|
|
4437
|
-
}, "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"")))), (0, _react2.mdx)("
|
|
4438
|
+
}, "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"")))), (0, _react2.mdx)("h3", null, "lane merge-abort"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
|
|
4439
|
+
parentName: "p"
|
|
4440
|
+
}, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
|
|
4441
|
+
parentName: "p"
|
|
4442
|
+
}, "lane merge-abort")), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
|
|
4443
|
+
parentName: "p"
|
|
4444
|
+
}, "Description"), ": abort the recent lane-merge. revert the lane object and checkout accordingly", (0, _react2.mdx)("br", {
|
|
4445
|
+
parentName: "p"
|
|
4446
|
+
}), "\n", "restore the lane-object same as it was before the last \"bit lane merge\" command.", (0, _react2.mdx)("br", {
|
|
4447
|
+
parentName: "p"
|
|
4448
|
+
}), "\n", "also, checkout the workspace components according to the restored lane"), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
|
|
4449
|
+
parentName: "table"
|
|
4450
|
+
}, (0, _react2.mdx)("tr", {
|
|
4451
|
+
parentName: "thead"
|
|
4452
|
+
}, (0, _react2.mdx)("th", {
|
|
4453
|
+
parentName: "tr",
|
|
4454
|
+
"align": null
|
|
4455
|
+
}, (0, _react2.mdx)("strong", {
|
|
4456
|
+
parentName: "th"
|
|
4457
|
+
}, "Option")), (0, _react2.mdx)("th", {
|
|
4458
|
+
parentName: "tr",
|
|
4459
|
+
"align": "center"
|
|
4460
|
+
}, (0, _react2.mdx)("strong", {
|
|
4461
|
+
parentName: "th"
|
|
4462
|
+
}, "Option alias")), (0, _react2.mdx)("th", {
|
|
4463
|
+
parentName: "tr",
|
|
4464
|
+
"align": null
|
|
4465
|
+
}, (0, _react2.mdx)("strong", {
|
|
4466
|
+
parentName: "th"
|
|
4467
|
+
}, "Description")))), (0, _react2.mdx)("tbody", {
|
|
4468
|
+
parentName: "table"
|
|
4469
|
+
}, (0, _react2.mdx)("tr", {
|
|
4470
|
+
parentName: "tbody"
|
|
4471
|
+
}, (0, _react2.mdx)("td", {
|
|
4472
|
+
parentName: "tr",
|
|
4473
|
+
"align": null
|
|
4474
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
4475
|
+
parentName: "td"
|
|
4476
|
+
}, "--verbose")), (0, _react2.mdx)("td", {
|
|
4477
|
+
parentName: "tr",
|
|
4478
|
+
"align": "center"
|
|
4479
|
+
}), (0, _react2.mdx)("td", {
|
|
4480
|
+
parentName: "tr",
|
|
4481
|
+
"align": null
|
|
4482
|
+
}, "show details of components that were not merged legitimately")), (0, _react2.mdx)("tr", {
|
|
4483
|
+
parentName: "tbody"
|
|
4484
|
+
}, (0, _react2.mdx)("td", {
|
|
4485
|
+
parentName: "tr",
|
|
4486
|
+
"align": null
|
|
4487
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
4488
|
+
parentName: "td"
|
|
4489
|
+
}, "--silent")), (0, _react2.mdx)("td", {
|
|
4490
|
+
parentName: "tr",
|
|
4491
|
+
"align": "center"
|
|
4492
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
4493
|
+
parentName: "td"
|
|
4494
|
+
}, "-s")), (0, _react2.mdx)("td", {
|
|
4495
|
+
parentName: "tr",
|
|
4496
|
+
"align": null
|
|
4497
|
+
}, "skip confirmation")), (0, _react2.mdx)("tr", {
|
|
4498
|
+
parentName: "tbody"
|
|
4499
|
+
}, (0, _react2.mdx)("td", {
|
|
4500
|
+
parentName: "tr",
|
|
4501
|
+
"align": null
|
|
4502
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
4503
|
+
parentName: "td"
|
|
4504
|
+
}, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
|
|
4505
|
+
parentName: "tr",
|
|
4506
|
+
"align": "center"
|
|
4507
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
4508
|
+
parentName: "td"
|
|
4509
|
+
}, "-x")), (0, _react2.mdx)("td", {
|
|
4510
|
+
parentName: "tr",
|
|
4511
|
+
"align": null
|
|
4512
|
+
}, "do not install packages of the imported components")))), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
|
|
4438
4513
|
parentName: "table"
|
|
4439
4514
|
}, (0, _react2.mdx)("tr", {
|
|
4440
4515
|
parentName: "thead"
|
|
@@ -5059,7 +5134,7 @@ function MDXContent(_ref) {
|
|
|
5059
5134
|
parentName: "p"
|
|
5060
5135
|
}), "\n", "if no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).", (0, _react2.mdx)("br", {
|
|
5061
5136
|
parentName: "p"
|
|
5062
|
-
}), "\n", "optionally use '--abort' to revert the last merge
|
|
5137
|
+
}), "\n", "optionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.", (0, _react2.mdx)("br", {
|
|
5063
5138
|
parentName: "p"
|
|
5064
5139
|
}), "\n", "you can use a pattern for multiple ids, such as bit merge \"utils/", "*", "\". (wrap the pattern with quotes to avoid collision with shell commands)"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("inlineCode", {
|
|
5065
5140
|
parentName: "p"
|
|
@@ -5232,7 +5307,56 @@ function MDXContent(_ref) {
|
|
|
5232
5307
|
parentName: "p"
|
|
5233
5308
|
}), "\n", "the modified are components that their source code have changed, it doesn't check for config/aspect changes"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("inlineCode", {
|
|
5234
5309
|
parentName: "p"
|
|
5235
|
-
}, "bit mini-status [component-pattern]")), (0, _react2.mdx)("
|
|
5310
|
+
}, "bit mini-status [component-pattern]")), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
|
|
5311
|
+
parentName: "table"
|
|
5312
|
+
}, (0, _react2.mdx)("tr", {
|
|
5313
|
+
parentName: "thead"
|
|
5314
|
+
}, (0, _react2.mdx)("th", {
|
|
5315
|
+
parentName: "tr",
|
|
5316
|
+
"align": null
|
|
5317
|
+
}, (0, _react2.mdx)("strong", {
|
|
5318
|
+
parentName: "th"
|
|
5319
|
+
}, "Option")), (0, _react2.mdx)("th", {
|
|
5320
|
+
parentName: "tr",
|
|
5321
|
+
"align": "center"
|
|
5322
|
+
}, (0, _react2.mdx)("strong", {
|
|
5323
|
+
parentName: "th"
|
|
5324
|
+
}, "Option alias")), (0, _react2.mdx)("th", {
|
|
5325
|
+
parentName: "tr",
|
|
5326
|
+
"align": null
|
|
5327
|
+
}, (0, _react2.mdx)("strong", {
|
|
5328
|
+
parentName: "th"
|
|
5329
|
+
}, "Description")))), (0, _react2.mdx)("tbody", {
|
|
5330
|
+
parentName: "table"
|
|
5331
|
+
}, (0, _react2.mdx)("tr", {
|
|
5332
|
+
parentName: "tbody"
|
|
5333
|
+
}, (0, _react2.mdx)("td", {
|
|
5334
|
+
parentName: "tr",
|
|
5335
|
+
"align": null
|
|
5336
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
5337
|
+
parentName: "td"
|
|
5338
|
+
}, "--show-issues")), (0, _react2.mdx)("td", {
|
|
5339
|
+
parentName: "tr",
|
|
5340
|
+
"align": "center"
|
|
5341
|
+
}), (0, _react2.mdx)("td", {
|
|
5342
|
+
parentName: "tr",
|
|
5343
|
+
"align": null
|
|
5344
|
+
}, "show component issues (slows down the command)")), (0, _react2.mdx)("tr", {
|
|
5345
|
+
parentName: "tbody"
|
|
5346
|
+
}, (0, _react2.mdx)("td", {
|
|
5347
|
+
parentName: "tr",
|
|
5348
|
+
"align": null
|
|
5349
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
5350
|
+
parentName: "td"
|
|
5351
|
+
}, "--json")), (0, _react2.mdx)("td", {
|
|
5352
|
+
parentName: "tr",
|
|
5353
|
+
"align": "center"
|
|
5354
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
5355
|
+
parentName: "td"
|
|
5356
|
+
}, "-j")), (0, _react2.mdx)("td", {
|
|
5357
|
+
parentName: "tr",
|
|
5358
|
+
"align": null
|
|
5359
|
+
}, "json format")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "move"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
|
|
5236
5360
|
parentName: "p"
|
|
5237
5361
|
}, "Alias"), ": ", (0, _react2.mdx)("inlineCode", {
|
|
5238
5362
|
parentName: "p"
|