git-merge-driver icon indicating copy to clipboard operation
git-merge-driver copied to clipboard

Is it possible to create this configuration artifact with CLI commands?

Open rulatir opened this issue 3 years ago • 2 comments

I must be able to script registering a merge driver. Can this configuration artifact

[merge "my-custom-driver"]
	name = A custom merge driver used to resolve conflicts in certain files
	driver = my-merge-tool.sh %O %A %B

be somehow created in the configuration using a sequence of git config CLI commands? I don't see a documentation anywhere on how to access values in sections named like [merge "my-custom-driver"] rather than with a single unquoted word like [user].

Your mergetool-setup.sh overwrites any existing config entirely, which is undesirable.

rulatir avatar Jun 02 '22 14:06 rulatir

CLI calls to add merge driver configs might be out there, but I'm not aware of them.

You could modify the mergetool-setup.sh to be a little smarter so it checks for existing configuration and appends the block in case it doesn't exist? Shouldn't be too hard.

This repo was only ever meant to serve as a simple example. Its organisation is defunct and I've long lost permissions to it. I only just noticed your issue through pure chance.

praqma-thi avatar Oct 13 '22 11:10 praqma-thi