Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 336933

Summary:	Support git --no-ff as an EGit preference
Product:	[Technology] EGit	Reporter:	Alex Blewitt <alex.blewitt>
Component:	UI	Assignee:	Tomasz Zarna <tomasz.zarna>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	bradcupit, caniszczyk, irbull, Jens.Rutschmann, mattias.ekberg, pwebster, s.muecke, stefan.lay, zuisener
Version:	unspecified
Target Milestone:	2.3
Hardware:	PC
OS:	All
Whiteboard:
Bug Depends on:
Bug Blocks:	335091

Description Alex Blewitt

2011-02-11 08:16:44 EST

Given that EGit can now create merge nodes, it would be nice to have the option to always create a merge node when merging from one branch to another. This is useful when following a git-flow type model where merge nodes are created to represent merging onto branches, even when a fast forward would be possible.

Comment 1 Remy Suen

2011-09-03 09:13:47 EDT

*** Bug 351723 has been marked as a duplicate of this bug. ***

Comment 2 Tomasz Zarna

2012-10-29 11:27:48 EDT

Started to work on the JGit part of the fix here: https://git.eclipse.org/r/#/c/8395/ 

As always, any comments are welcome.

Comment 3 Chris Aniszczyk

2012-11-15 19:45:18 EST

This can be fixed now with bug 394432

Comment 4 Tomasz Zarna

2012-11-18 16:42:10 EST

(In reply to comment #3)
> This can be fixed now with bug 394432

I'm on it: https://git.eclipse.org/r/#/c/8754/

Comment 5 Tomasz Zarna

2013-01-10 05:19:47 EST

Fixed in acb7fee2faa7b181ded810c6e5dc5371b428c473. Filed bug 397835 to update the Merge dialog.

Comment 6 Tomasz Zarna

2013-01-17 06:36:00 EST

This change has been reverted due to a breaking change in JGit (see https://git.eclipse.org/r/#/c/8991/). I'm working on a better fix.

Comment 7 Tomasz Zarna

2013-01-22 06:36:52 EST

Fixed again with https://git.eclipse.org/r/#/c/9743/ and https://git.eclipse.org/r/#/c/9800/ . Hopefully for good this time.