Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

EGit: Merge without a commit

Tags:

egit

Is it possible to merge a branch without a commit like it would be possible with C git git merge myBranch --no-ff --no-commit?

Repository settings like merge.ff = no or merge.commit = no are ignored.

I'm using EGit 3.0 which comes with the new Kepler release of Eclipse.

like image 640
T3rm1 Avatar asked Mar 23 '26 03:03

T3rm1


1 Answers

The merge options are available in the merge dialog which can be invoked like this:

  1. Select a project
  2. Open its context menu, select Team > Merge...
  3. Chose the branch to merge and the desired options below

Note that currently only squashing and fast-forward options are supported.

like image 102
robinst Avatar answered Mar 25 '26 20:03

robinst