DESCRIPTION

Support git --no-ff as an EGit preference

Bug: 336933
JGit-Dependency: I3ecc16d48e715b81320b73ffae4caf3558f965f2
Change-Id: I22471ee4c8be0ad094976137aa01c263e17f841d


COMMENTS

author: Clay Cameron
date: 2012-12-09 23:50:40.000000000

Uploaded patch set 6.

-------------------------------------
author: Clay Cameron
date: 2012-12-09 23:52:32.000000000

Patch Set 6: (1 inline comment)



Line:123, org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java -> Extract method?

-------------------------------------
author: Brenden Conley
date: 2012-12-10 00:01:00.000000000

Patch Set 6:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/3818/ 

-------------------------------------
author: Brenden Conley
date: 2012-12-10 00:02:45.000000000

Patch Set 6: Fails

Build Failed 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3818/ : FAILURE

-------------------------------------
