		@@ -16,5 +16,3 @@ #!/usr/bin/env node
		program
		.description(
		'Merge Drivers CLI: A command-line interface to conveniently manage custom git merge drivers',
		)
		.description(packageJson.description)
		.version(packageJson.version, '-v, --version', 'Output the current version');
		@@ -21,0 +19,0 @@

package.json

		{
		"name": "merge-drivers",
		"version": "1.0.1",
		"description": "TODO",
		"version": "1.0.2",
		"description": "Merge Drivers CLI: A command-line interface to conveniently manage custom git merge drivers",
		"keywords": [
		"git",
		"merge",
		"driver",
		"drivers",
		"conflict",
		"cli"
		],
		"bugs": {
		"url": "https://github.com/charpeni/merge-drivers/issues"
		"url": "https://github.com/charpeni/merge-drivers-cli/issues"
		},
		"homepage": "https://github.com/charpeni/merge-drivers",
		"readme": "https://github.com/charpeni/merge-drivers#readme",
		"homepage": "https://github.com/charpeni/merge-drivers-cli",
		"readme": "https://github.com/charpeni/merge-drivers-cli#readme",
		"repository": {
		"type": "git",
		"url": "https://github.com/charpeni/merge-drivers.git"
		"url": "https://github.com/charpeni/merge-drivers-cli.git"
		},
		@@ -14,0 +22,0 @@ "type": "module",

README.md

		@@ -20,6 +20,3 @@ <p align="center">
		</a>
		<a href="https://circleci.com/gh/charpeni/merge-drivers-cli">
		<img src="https://circleci.com/gh/charpeni/merge-drivers-cli.svg?style=shield" alt="Current CircleCI build status." />
		</a>
		<a href="https://circleci.com/gh/charpeni/merge-drivers-cli">
		<a href="https://makeapullrequest.com">
		<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome!" />
		@@ -34,3 +31,3 @@ </a>

		Git offers the ability to define two types of custom merge drivers. The first one is global, accessible through `~/.gitconfig`. The second one is local, accessible through `.git/config`. The problem is that the configuration of these drivers is not very convenient as neither of these solutions are versioned.
		Git offers the ability to define two types of custom merge drivers. The first one is global, accessible through `~/.gitconfig`. The second one is local, accessible through `.git/config`. The problem is that the configuration of these drivers is not very convenient as neither of these solutions are versioned.

		@@ -91,2 +88,2 @@ This CLI aims to solve this problem by providing a simple and intuitive interface to manage these drivers.

		merge-drivers is [MIT licensed](LICENSE).
		merge-drivers is [MIT licensed](LICENSE).

.circleci/config.yml

merge-drivers - npm Package Compare versions

New alerts