Eclipse Community Forums: EGit » Merge does not respect mergeoptions

Help

Home

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

Show: Today's Messages :: Show Polls :: Message Navigator

Merge does not respect mergeoptions [message #824488]

Mon, 19 March 2012 14:33

rahim virani
Messages: 3
Registered: March 2012

Junior Member

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.

Report message to a moderator

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

Mon, 19 March 2012 15:59

Christian Halstrick is currently offline

Christian Halstrick
Messages: 73
Registered: July 2009

Member

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.

Ciao
Chris

Report message to a moderator

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

Mon, 19 March 2012 16:05

rahim virani
Messages: 3
Registered: March 2012

Junior Member

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

Report message to a moderator

Previous Topic:	Remote Tracking Branch Issues
Next Topic:	Eclipse does not seem to recognize ecdsa-sha2-nistp256 fingerprint

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri May 24 00:06:56 EDT 2013