DESCRIPTION

Add option for --no-commit in merge dialog

Bug: 411978
Change-Id: I01f09825dde43e37177a4d32a32733030a40d87a


COMMENTS

author: Brenden Conley
date: 2013-07-18 17:34:00.000000000

Patch Set 3:

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

-------------------------------------
author: Danika Greer
date: 2013-07-18 17:39:24.000000000

Patch Set 3:

(1 comment)

See inline comment. Also fixed bug reference in commit message – wanted to try the new "inline editing" feature of Gerrit :).

Line:1008, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> I think the difference between "no commit" and "squash" could be clearer.

How about "N&o commit (prepare merge commit, but don't commit yet)" and "&Squash (merge changes into working directory, but don't create merge commit)"?

-------------------------------------
author: Brenden Conley
date: 2013-07-18 17:52:31.000000000

Patch Set 3: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/4711/ : UNSTABLE

-------------------------------------
author: Clay Cameron
date: 2013-07-25 08:53:27.000000000

Patch Set 3:

(1 comment)

Line:1008, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> Done

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