Eclipse Community Forums: EGit / JGit » EGit interactive rebase

Help

Home

Home » Eclipse Projects » EGit / JGit » EGit interactive rebase

Show: Today's Messages :: Show Polls :: Message Navigator

EGit interactive rebase [message #1245433]

Thu, 13 February 2014 20:12

Ernest Jean

Messages: 2
Registered: February 2014

Junior Member

Hi all,

Im using Eclipse Luna M5 and i have a question about Egit interactive,
Id like to rewrite all my commit message in my branch with the interactive rebase tool, i follow the step shown here : m-sohn.blogspot.com/2013/11/interactive-rebase-with-egit-32.html and choose reword for all my commit. I thought it would only open a Commit message dialog where i can update my commit message.

But instead where's some merge error for all my commit...

Any thought where it could come from ?

Kind regards,

Ernest

Report message to a moderator

Re: EGit interactive rebase [message #1245515 is a reply to message #1245433]

Thu, 13 February 2014 23:12

Matthias Sohn

Messages: 1268
Registered: July 2009

Senior Member

- what's the error message ?
- any errors logged in the error log ?
- are you trying to rebase a merge commit ?
- which EGit version are you using ?

Report message to a moderator

Re: EGit interactive rebase [message #1245523 is a reply to message #1245515]

Thu, 13 February 2014 23:28

Ernest Jean

Messages: 2
Registered: February 2014

Junior Member

Hey,

Im using the last EGit version shipped with luna M5, but i think i was being dumb, i was trying to do an interactive rebase on a non linear branch and i naively thought i wouldnt have to fix merge conflicts and just changed the commit message . Since i only wanted to reword my commit.

Report message to a moderator

Re: EGit interactive rebase [message #1247904 is a reply to message #1245523]

Sun, 16 February 2014 19:11

Robin Rosenberg

Messages: 332
Registered: July 2009

Senior Member

Ernest Jean skrev 2014-02-14 00.28:
> Hey,
> Im using the last EGit version shipped with luna M5, but i think i was being dumb, i was trying to do an interactive rebase on a non linear branch and i naively thought i
> wouldnt have to fix merge conflicts and just changed the commit message . Since i only wanted to reword my commit.

C Git would do the same, unless you use the -p switch (preserve merges), which EGit does yet support.

-- robin

Report message to a moderator