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

Bug 397835

Summary:	Show fast forward modes in Merge dialog
Product:	[Technology] EGit	Reporter:	Tomasz Zarna <tomasz.zarna>
Component:	UI	Assignee:	Tomasz Zarna <tomasz.zarna>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	matthias.sohn
Version:	2.3
Target Milestone:	3.0
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Tomasz Zarna

2013-01-10 05:18:17 EST

With bug 336933 fixed fast forward modes are now respected in EGit. The next step would be displaying the current mode in the Merge dialog, with an option to change it for the current run and a link to the repo's properties page (to change it permanently).

Comment 1 Matthias Sohn

2013-03-07 15:52:55 EST

merged "Show fast forward modes in Merge dialog" as ecf994271500206b1337feef8f3974cb214278da

Comment 2 Tomasz Zarna

2013-03-07 16:04:38 EST

Marking as fixed.