Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
rulatir opened this issue Jun 2, 2022 · 1 comment

Comments

@rulatir
Copy link

rulatir commented Jun 2, 2022

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.

@praqma-thi
Copy link

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants