@teambit/harmony.content.cli-reference 1.95.162 → 1.95.163

package/cli-reference.docs.mdx

@@ -1,12 +1,5 @@
 ---
-description: 'An MDX component.'
-labels: ['content', 'mdx']
+description: 'Bit command synopses. Bit version: 0.1.82'
+labels: ['cli', 'mdx', 'docs']
 ---
-
-import { CliReference } from './index';
-
-### Component usage
-
-```js
-<CliReference />
-```
+      

package/cli-reference.json

@@ -622,6 +622,11 @@
             "metadata",
             "metadata/front-matter to place at the top of the .md file, enter as an object e.g. --metadata.id=cli --metadata.title=commands"
           ],
+          [
+            "",
+            "docs",
+            "generate the cli-reference.docs.mdx file"
+          ],
           [
             "j",
             "json",
@@ -1226,6 +1231,41 @@
       }
     ]
   },
+  {
+    "name": "git <sub-command>",
+    "alias": "",
+    "options": [],
+    "description": "perform git operations",
+    "extendedDescription": "",
+    "group": "git",
+    "private": false,
+    "commands": [
+      {
+        "name": "set-merge-driver",
+        "alias": "smd",
+        "options": [
+          [
+            "g",
+            "global",
+            "set the git merge driver globally"
+          ]
+        ],
+        "description": "setup bit's git merge driver for bitmap files",
+        "extendedDescription": "",
+        "group": "git",
+        "private": false
+      },
+      {
+        "name": "merge-bitmaps <ancestor> <current> <other>",
+        "alias": "",
+        "options": [],
+        "description": "a special command to merge conflicting bitmap files during git merge",
+        "extendedDescription": "",
+        "group": "git",
+        "private": true
+      }
+    ]
+  },
   {
     "name": "watch",
     "alias": "",

package/cli-reference.mdx

@@ -287,6 +287,7 @@ The following gets removed by this command:
 | **Option**   | **Option alias** | **Description**                                                                                                                |
 | ------------ | :--------------: | ------------------------------------------------------------------------------------------------------------------------------ |
 | `--metadata` |                  | metadata/front-matter to place at the top of the .md file, enter as an object e.g. --metadata.id=cli --metadata.title=commands |
+| `--docs`     |                  | generate the cli-reference.docs.mdx file                                                                                       |
 | `--json`     |       `-j`       | output the commands info as JSON                                                                                               |
 
 ---
@@ -637,6 +638,30 @@ bit export => export all staged components to their current scope, if checked ou
 
 ---
 
+## git
+
+**Description**: perform git operations
+
+`bit git <sub-command>`
+
+### git set-merge-driver
+
+**Usage**: `git set-merge-driver`
+
+**Description**: setup bit's git merge driver for bitmap files
+
+| **Option** | **Option alias** | **Description**                   |
+| ---------- | :--------------: | --------------------------------- |
+| `--global` |       `-g`       | set the git merge driver globally |
+
+### git merge-bitmaps
+
+**Usage**: `git merge-bitmaps <ancestor> <current> <other>`
+
+**Description**: a special command to merge conflicting bitmap files during git merge
+
+---
+
 ## globals
 
 **Description**: list all globals

package/dist/cli-reference.docs.mdx

@@ -1,12 +1,5 @@
 ---
-description: 'An MDX component.'
-labels: ['content', 'mdx']
+description: 'Bit command synopses. Bit version: 0.1.82'
+labels: ['cli', 'mdx', 'docs']
 ---
-
-import { CliReference } from './index';
-
-### Component usage
-
-```js
-<CliReference />
-```
+      

package/dist/cli-reference.json

@@ -622,6 +622,11 @@
                         "metadata",
                         "metadata/front-matter to place at the top of the .md file, enter as an object e.g. --metadata.id=cli --metadata.title=commands"
                     ],
+                    [
+                        "",
+                        "docs",
+                        "generate the cli-reference.docs.mdx file"
+                    ],
                     [
                         "j",
                         "json",
@@ -1226,6 +1231,41 @@
             }
         ]
     },
+    {
+        "name": "git <sub-command>",
+        "alias": "",
+        "options": [],
+        "description": "perform git operations",
+        "extendedDescription": "",
+        "group": "git",
+        "private": false,
+        "commands": [
+            {
+                "name": "set-merge-driver",
+                "alias": "smd",
+                "options": [
+                    [
+                        "g",
+                        "global",
+                        "set the git merge driver globally"
+                    ]
+                ],
+                "description": "setup bit's git merge driver for bitmap files",
+                "extendedDescription": "",
+                "group": "git",
+                "private": false
+            },
+            {
+                "name": "merge-bitmaps <ancestor> <current> <other>",
+                "alias": "",
+                "options": [],
+                "description": "a special command to merge conflicting bitmap files during git merge",
+                "extendedDescription": "",
+                "group": "git",
+                "private": true
+            }
+        ]
+    },
     {
         "name": "watch",
         "alias": "",

package/dist/cli-reference.mdx.js

@@ -1341,6 +1341,19 @@ function MDXContent(_ref) {
     "align": null
   }, (0, _react2.mdx)("inlineCode", {
     parentName: "td"
+  }, "--docs")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "generate the cli-reference.docs.mdx file")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
   }, "--json")), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": "center"
@@ -2625,7 +2638,59 @@ function MDXContent(_ref) {
   }, "-j")), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": null
-  }, "return the format results in json format")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "globals"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+  }, "return the format results in json format")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "git"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+    parentName: "p"
+  }, "Description"), ": perform git operations"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("inlineCode", {
+    parentName: "p"
+  }, "bit git <sub-command>")), (0, _react2.mdx)("h3", null, "git set-merge-driver"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+    parentName: "p"
+  }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
+    parentName: "p"
+  }, "git set-merge-driver")), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+    parentName: "p"
+  }, "Description"), ": setup bit's git merge driver for bitmap files"), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
+    parentName: "table"
+  }, (0, _react2.mdx)("tr", {
+    parentName: "thead"
+  }, (0, _react2.mdx)("th", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("strong", {
+    parentName: "th"
+  }, "Option")), (0, _react2.mdx)("th", {
+    parentName: "tr",
+    "align": "center"
+  }, (0, _react2.mdx)("strong", {
+    parentName: "th"
+  }, "Option alias")), (0, _react2.mdx)("th", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("strong", {
+    parentName: "th"
+  }, "Description")))), (0, _react2.mdx)("tbody", {
+    parentName: "table"
+  }, (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "--global")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
+  }, "-g")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "set the git merge driver globally")))), (0, _react2.mdx)("h3", null, "git merge-bitmaps"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+    parentName: "p"
+  }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
+    parentName: "p"
+  }, "git merge-bitmaps <ancestor> <current> <other>")), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
+    parentName: "p"
+  }, "Description"), ": a special command to merge conflicting bitmap files during git merge"), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "globals"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
     parentName: "p"
   }, "Description"), ": list all globals"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("inlineCode", {
     parentName: "p"