Eclipse Community Forums: EGit / JGit » Merge does not respect mergeoptions

Home » Eclipse Projects » EGit / JGit » Merge does not respect mergeoptions(config file value not used)

Merge does not respect mergeoptions [message #824488]

Mon, 19 March 2012 14:33

Eclipse User

I have the following entry in my global git config file:

branch.master.mergeoptions=--no-commit --no-ff

At the command line, this takes effect. However, in EGit, neither option is effective. EGit will do a fast forward merge and auto-commit (if applicable).

How do I get EGit to respect the value here, or at minimum, perform a non-fast-forward AND non-committing merge? The merge dialog has no options.

Re: Merge does not respect mergeoptions [message #824542 is a reply to message #824488]

Mon, 19 March 2012 15:59

Eclipse User

EGit uses JGit for all git operations. And JGit simply doesn't support these options yet. We would have to first build these options into JGit and second enhance the UI in EGit to show these options.

I added a implementation of no-commit in https://git.eclipse.org/r/#/c/4945/. But it is not yet merged. I think nobody has started with no-ff yet. Contributions welcome Smile

I'll see whether we at least get no-commit in soon.

Re: Merge does not respect mergeoptions [message #824548 is a reply to message #824542]

Mon, 19 March 2012 16:05

Eclipse User

thanks for your response and work. I am looking forward to these features.

Re: Merge does not respect mergeoptions [message #1406951 is a reply to message #824548]

Mon, 11 August 2014 09:55

Eclipse User

Sorry for reawakening such an old thread. I noticed that the implementation of no-commit has since been integrated to JGit, but I couldn't find any option to set it as a default instead of selecting it every time I merge in the merge dialog. Do you happen to know if there is such an option (and how to set it)?

Re: Merge does not respect mergeoptions [message #1408664 is a reply to message #1406951]

Fri, 15 August 2014 14:34

Eclipse User

Since the latest EGIt release 3.4 you can use 'branch.<name>.mergeoptions' to configure the options used when merging into a given branch. As the command line Git client it supports a space-separated list of command line merge options as its value.

To always merge without committing into the master branch you can set
'branch.master.mergeoptions' to '--no-commit'. The merge dialog will show the appropriate options pre-selected.

Re: Merge does not respect mergeoptions [message #1409587 is a reply to message #1408664]

Mon, 18 August 2014 09:24

Eclipse User

Perfect, works like a charm! Thanks a lot Smile

Previous Topic:	Push a specific commit to remote repository
Next Topic:	JGit version of 'git merge-tree'

Goto Forum:

-=] Back to Top [=-

Current Time: Fri Jul 25 00:57:38 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter