Skip to content

Commit 1b26b65

Browse files
mcarvin8nvuillamscolladonyohanim
authored
feat: support manifest (package.xml like) merge (#155)
Co-authored-by: Nicolas Vuillamy <17500430+nvuillam@users.noreply.github.com> Co-authored-by: Sebastien <522422+scolladon@users.noreply.github.com> Co-authored-by: yohanim <2168165+yohanim@users.noreply.github.com>
1 parent 3f818a9 commit 1b26b65

File tree

13 files changed

+1353
-754
lines changed

13 files changed

+1353
-754
lines changed

README.md

Lines changed: 66 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,21 +165,76 @@ git merge ...
165165
## Commands
166166

167167
<!-- commands -->
168+
* [`sf git merge driver disable`](#sf-git-merge-driver-disable)
169+
* [`sf git merge driver enable`](#sf-git-merge-driver-enable)
168170
* [`sf git merge driver install`](#sf-git-merge-driver-install)
169171
* [`sf git merge driver run`](#sf-git-merge-driver-run)
170172
* [`sf git merge driver uninstall`](#sf-git-merge-driver-uninstall)
171173

172-
## `sf git merge driver install`
174+
## `sf git merge driver disable`
175+
176+
Uninstalls the local git merge driver for the given org and branch.
177+
178+
```
179+
USAGE
180+
$ sf git merge driver disable [--json] [--flags-dir <value>]
181+
182+
GLOBAL FLAGS
183+
--flags-dir=<value> Import flag values from a directory.
184+
--json Format output as json.
185+
186+
DESCRIPTION
187+
Uninstalls the local git merge driver for the given org and branch.
188+
189+
Uninstalls the local git merge driver for the given org and branch, by removing the merge driver content in the
190+
`.git/info/attributes` files in the project, deleting the merge driver configuration from the `.git/config` of the
191+
project, and removing the installed binary from the node_modules/.bin directory.
192+
193+
ALIASES
194+
$ sf git merge driver disable
195+
196+
EXAMPLES
197+
Uninstall the driver for a given project:
198+
199+
$ sf git merge driver disable
200+
```
201+
202+
## `sf git merge driver enable`
173203

174204
Installs a local git merge driver for the given org and branch.
175205

176206
```
177207
USAGE
178-
$ sf git merge driver install [--json] [--flags-dir <value>]
208+
$ sf git merge driver enable [--json] [--flags-dir <value>]
209+
210+
GLOBAL FLAGS
211+
--flags-dir=<value> Import flag values from a directory.
212+
--json Format output as json.
213+
214+
DESCRIPTION
215+
Installs a local git merge driver for the given org and branch.
216+
217+
Installs a local git merge driver for the given org and branch, by updating the `.git/info/attributes` files in the
218+
project, creating a new merge driver configuration in the `.git/config` of the project, and installing the binary in
219+
the node_modules/.bin directory.
179220
180221
ALIASES
181222
$ sf git merge driver enable
182223
224+
EXAMPLES
225+
Install the driver for a given project:
226+
227+
$ sf git merge driver enable
228+
```
229+
230+
## `sf git merge driver install`
231+
232+
Installs a local git merge driver for the given org and branch.
233+
234+
```
235+
USAGE
236+
$ sf git merge driver install [--json] [--flags-dir <value>]
237+
183238
GLOBAL FLAGS
184239
--flags-dir=<value> Import flag values from a directory.
185240
--json Format output as json.
@@ -191,13 +246,16 @@ DESCRIPTION
191246
project, creating a new merge driver configuration in the `.git/config` of the project, and installing the binary in
192247
the node_modules/.bin directory.
193248
249+
ALIASES
250+
$ sf git merge driver enable
251+
194252
EXAMPLES
195253
Install the driver for a given project:
196254
197255
$ sf git merge driver install
198256
```
199257

200-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/main/src/commands/git/merge/driver/install.ts)_
258+
_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)_
201259

202260
## `sf git merge driver run`
203261

@@ -241,7 +299,7 @@ EXAMPLES
241299
- output-file is the path to the file where the merged content will be written
242300
```
243301

244-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/main/src/commands/git/merge/driver/run.ts)_
302+
_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)_
245303

246304
## `sf git merge driver uninstall`
247305

@@ -251,9 +309,6 @@ Uninstalls the local git merge driver for the given org and branch.
251309
USAGE
252310
$ sf git merge driver uninstall [--json] [--flags-dir <value>]
253311
254-
ALIASES
255-
$ sf git merge driver disable
256-
257312
GLOBAL FLAGS
258313
--flags-dir=<value> Import flag values from a directory.
259314
--json Format output as json.
@@ -265,13 +320,16 @@ DESCRIPTION
265320
`.git/info/attributes` files in the project, deleting the merge driver configuration from the `.git/config` of the
266321
project, and removing the installed binary from the node_modules/.bin directory.
267322
323+
ALIASES
324+
$ sf git merge driver disable
325+
268326
EXAMPLES
269327
Uninstall the driver for a given project:
270328
271329
$ sf git merge driver uninstall
272330
```
273331

274-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/main/src/commands/git/merge/driver/uninstall.ts)_
332+
_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)_
275333
<!-- commandsstop -->
276334
## Changelog
277335

0 commit comments

Comments
 (0)