sf-git-merge-driver 1.2.2 → 1.3.0

package/README.md

@@ -165,10 +165,68 @@ git merge ...
 ## Commands
 
 <!-- commands -->
+* [`sf git merge driver disable`](#sf-git-merge-driver-disable)
+* [`sf git merge driver enable`](#sf-git-merge-driver-enable)
 * [`sf git merge driver install`](#sf-git-merge-driver-install)
 * [`sf git merge driver run`](#sf-git-merge-driver-run)
 * [`sf git merge driver uninstall`](#sf-git-merge-driver-uninstall)
 
+## `sf git merge driver disable`
+
+Uninstalls the local git merge driver for the given org and branch.
+
+```
+USAGE
+  $ sf git merge driver disable [--json] [--flags-dir <value>]
+
+GLOBAL FLAGS
+  --flags-dir=<value>  Import flag values from a directory.
+  --json               Format output as json.
+
+DESCRIPTION
+  Uninstalls the local git merge driver for the given org and branch.
+
+  Uninstalls the local git merge driver for the given org and branch, by removing the merge driver content in the
+  `.git/info/attributes` files in the project, deleting the merge driver configuration from the `.git/config` of the
+  project, and removing the installed binary from the node_modules/.bin directory.
+
+ALIASES
+  $ sf git merge driver disable
+
+EXAMPLES
+  Uninstall the driver for a given project:
+
+    $ sf git merge driver disable
+```
+
+## `sf git merge driver enable`
+
+Installs a local git merge driver for the given org and branch.
+
+```
+USAGE
+  $ sf git merge driver enable [--json] [--flags-dir <value>]
+
+GLOBAL FLAGS
+  --flags-dir=<value>  Import flag values from a directory.
+  --json               Format output as json.
+
+DESCRIPTION
+  Installs a local git merge driver for the given org and branch.
+
+  Installs a local git merge driver for the given org and branch, by updating the `.git/info/attributes` files in the
+  project, creating a new merge driver configuration in the `.git/config` of the project, and installing the binary in
+  the node_modules/.bin directory.
+
+ALIASES
+  $ sf git merge driver enable
+
+EXAMPLES
+  Install the driver for a given project:
+
+    $ sf git merge driver enable
+```
+
 ## `sf git merge driver install`
 
 Installs a local git merge driver for the given org and branch.
@@ -188,13 +246,16 @@ DESCRIPTION
   project, creating a new merge driver configuration in the `.git/config` of the project, and installing the binary in
   the node_modules/.bin directory.
 
+ALIASES
+  $ sf git merge driver enable
+
 EXAMPLES
   Install the driver for a given project:
 
     $ sf git merge driver install
 ```
 
-_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.2/src/commands/git/merge/driver/install.ts)_
+_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.3.0/src/commands/git/merge/driver/install.ts)_
 
 ## `sf git merge driver run`
 
@@ -238,7 +299,7 @@ EXAMPLES
   - output-file is the path to the file where the merged content will be written
 ```
 
-_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.2/src/commands/git/merge/driver/run.ts)_
+_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.3.0/src/commands/git/merge/driver/run.ts)_
 
 ## `sf git merge driver uninstall`
 
@@ -259,13 +320,16 @@ DESCRIPTION
   `.git/info/attributes` files in the project, deleting the merge driver configuration from the `.git/config` of the
   project, and removing the installed binary from the node_modules/.bin directory.
 
+ALIASES
+  $ sf git merge driver disable
+
 EXAMPLES
   Uninstall the driver for a given project:
 
     $ sf git merge driver uninstall
 ```
 
-_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.2/src/commands/git/merge/driver/uninstall.ts)_
+_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.3.0/src/commands/git/merge/driver/uninstall.ts)_
 <!-- commandsstop -->
 ## Changelog
 

package/lib/commands/git/merge/driver/install.d.ts

@@ -1,6 +1,7 @@
 import { SfCommand } from '@salesforce/sf-plugins-core';
 export default class Install extends SfCommand<void> {
     static readonly summary: string;
+    static readonly aliases: string[];
     static readonly description: string;
     static readonly examples: string[];
     static readonly flags: {};

package/lib/commands/git/merge/driver/install.js

@@ -10,6 +10,9 @@ Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages(PLUGIN_NAME, 'install');
 export default class Install extends SfCommand {
     static summary = messages.getMessage('summary');
+    static aliases = [
+        'git:merge:driver:enable',
+    ];
     static description = messages.getMessage('description');
     static examples = messages.getMessages('examples');
     static flags = {};

package/lib/commands/git/merge/driver/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/install.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AAE9D,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,SAAe;IAC3C,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG,EAAE,CAAA;IAG7B,AAAN,KAAK,CAAC,GAAG;QACd,IAAI,CAAC;YACH,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;YACnD,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAA;QACnE,CAAC;QACD,MAAM,IAAI,cAAc,EAAE,CAAC,kBAAkB,EAAE,CAAA;QAC/C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IACpD,CAAC;;AATY;IADZ,GAAG;kCAUH"}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/install.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AAE9D,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,SAAe;IAC3C,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,OAAO,GAAa;QAClD,yBAAyB;KAC1B,CAAA;IACM,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG,EAAE,CAAA;IAG7B,AAAN,KAAK,CAAC,GAAG;QACd,IAAI,CAAC;YACH,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;YACnD,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAA;QACnE,CAAC;QACD,MAAM,IAAI,cAAc,EAAE,CAAC,kBAAkB,EAAE,CAAA;QAC/C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IACpD,CAAC;;AATY;IADZ,GAAG;kCAUH"}

package/lib/commands/git/merge/driver/uninstall.d.ts

@@ -3,6 +3,7 @@ export default class Uninstall extends SfCommand<void> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
+    static readonly aliases: string[];
     static readonly flags: {};
     run(): Promise<void>;
 }

package/lib/commands/git/merge/driver/uninstall.js

@@ -11,6 +11,9 @@ export default class Uninstall extends SfCommand {
     static summary = messages.getMessage('summary');
     static description = messages.getMessage('description');
     static examples = messages.getMessages('examples');
+    static aliases = [
+        'git:merge:driver:disable',
+    ];
     static flags = {};
     async run() {
         await new UninstallService().uninstallMergeDriver();

package/lib/commands/git/merge/driver/uninstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/uninstall.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;AAEhE,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAe;IAC7C,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG,EAAE,CAAA;IAG7B,AAAN,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;QACnD,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;IACtD,CAAC;;AAHY;IADZ,GAAG;oCAIH"}
+{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/uninstall.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;AAEhE,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAe;IAC7C,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IACpE,MAAM,CAAmB,OAAO,GAAa;QAClD,0BAA0B;KAC3B,CAAA;IAEM,MAAM,CAAmB,KAAK,GAAG,EAAE,CAAA;IAG7B,AAAN,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;QACnD,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;IACtD,CAAC;;AAHY;IADZ,GAAG;oCAIH"}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "sf-git-merge-driver",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sf-git-merge-driver",
-      "version": "1.2.2",
+      "version": "1.3.0",
       "license": "MIT",
       "dependencies": {
         "@oclif/core": "^4.8.0",

package/oclif.manifest.json

@@ -1,7 +1,9 @@
 {
   "commands": {
     "git:merge:driver:install": {
-      "aliases": [],
+      "aliases": [
+        "git:merge:driver:enable"
+      ],
       "args": {},
       "description": "Installs a local git merge driver for the given org and branch, by updating the `.git/info/attributes` files in the project, creating a new merge driver configuration in the `.git/config` of the project, and installing the binary in the node_modules/.bin directory.",
       "examples": [
@@ -42,7 +44,32 @@
         "driver",
         "install.js"
       ],
-      "aliasPermutations": [],
+      "aliasPermutations": [
+        "git:merge:driver:enable",
+        "merge:git:driver:enable",
+        "merge:driver:git:enable",
+        "merge:driver:enable:git",
+        "git:driver:merge:enable",
+        "driver:git:merge:enable",
+        "driver:merge:git:enable",
+        "driver:merge:enable:git",
+        "git:driver:enable:merge",
+        "driver:git:enable:merge",
+        "driver:enable:git:merge",
+        "driver:enable:merge:git",
+        "git:merge:enable:driver",
+        "merge:git:enable:driver",
+        "merge:enable:git:driver",
+        "merge:enable:driver:git",
+        "git:enable:merge:driver",
+        "enable:git:merge:driver",
+        "enable:merge:git:driver",
+        "enable:merge:driver:git",
+        "git:enable:driver:merge",
+        "enable:git:driver:merge",
+        "enable:driver:git:merge",
+        "enable:driver:merge:git"
+      ],
       "permutations": [
         "git:merge:driver:install",
         "merge:git:driver:install",
@@ -214,7 +241,9 @@
       ]
     },
     "git:merge:driver:uninstall": {
-      "aliases": [],
+      "aliases": [
+        "git:merge:driver:disable"
+      ],
       "args": {},
       "description": "Uninstalls the local git merge driver for the given org and branch, by removing the merge driver content in the `.git/info/attributes` files in the project, deleting the merge driver configuration from the `.git/config` of the project, and removing the installed binary from the node_modules/.bin directory.",
       "examples": [
@@ -255,7 +284,32 @@
         "driver",
         "uninstall.js"
       ],
-      "aliasPermutations": [],
+      "aliasPermutations": [
+        "git:merge:driver:disable",
+        "merge:git:driver:disable",
+        "merge:driver:git:disable",
+        "merge:driver:disable:git",
+        "git:driver:merge:disable",
+        "driver:git:merge:disable",
+        "driver:merge:git:disable",
+        "driver:merge:disable:git",
+        "git:driver:disable:merge",
+        "driver:git:disable:merge",
+        "driver:disable:git:merge",
+        "driver:disable:merge:git",
+        "git:merge:disable:driver",
+        "merge:git:disable:driver",
+        "merge:disable:git:driver",
+        "merge:disable:driver:git",
+        "git:disable:merge:driver",
+        "disable:git:merge:driver",
+        "disable:merge:git:driver",
+        "disable:merge:driver:git",
+        "git:disable:driver:merge",
+        "disable:git:driver:merge",
+        "disable:driver:git:merge",
+        "disable:driver:merge:git"
+      ],
       "permutations": [
         "git:merge:driver:uninstall",
         "merge:git:driver:uninstall",
@@ -284,5 +338,5 @@
       ]
     }
   },
-  "version": "1.2.2"
+  "version": "1.3.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-git-merge-driver",
   "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",