Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » EGit interactive rebase
EGit interactive rebase [message #1245433] Thu, 13 February 2014 20:12 Go to next message
Ernest Jean is currently offline 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
Re: EGit interactive rebase [message #1245515 is a reply to message #1245433] Thu, 13 February 2014 23:12 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 580
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 ?
Re: EGit interactive rebase [message #1245523 is a reply to message #1245515] Thu, 13 February 2014 23:28 Go to previous messageGo to next message
Ernest Jean is currently offline 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.
Re: EGit interactive rebase [message #1247904 is a reply to message #1245523] Sun, 16 February 2014 19:11 Go to previous messageGo to next message
Robin Rosenberg is currently offline Robin Rosenberg
Messages: 324
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
Re: EGit interactive rebase [message #1249454 is a reply to message #1247904] Tue, 18 February 2014 09:13 Go to previous message
Matthias Sohn is currently offline Matthias Sohn
Messages: 580
Registered: July 2009
Senior Member
if you want to rewrite all commits in your repository you probably better use git filter-branch
https://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html
Previous Topic:Sub module DIRTY-IN-WORKTREE problem when merging
Next Topic:Team Project Set - Specify Version
Goto Forum:
  


Current Time: Tue Sep 23 06:38:10 GMT 2014

Powered by FUDForum. Page generated in 0.02595 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software