Bugzilla – Full Text Bug Listing
| Summary: | Show dialog for editing merge commit message when doing a merge | ||
|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | Jon Schewe <jpschewe> |
| Component: | UI | Assignee: | Project Inbox <egit.ui-inbox> |
| Status: | RESOLVED WORKSFORME | QA Contact: | |
| Severity: | enhancement | ||
| Priority: | P3 | CC: | matthias.sohn, robin |
| Version: | unspecified | Keywords: | helpwanted |
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Mac OS X | ||
| Whiteboard: | |||
|
Description
Jon Schewe
You can edit the message by amending the commit after merging. Is that not enough? I'm not sure showing a dialog for each merge is a good idea, or what would you propose? Current versions of git have you edit the merge messages by default now, so I don't see why bringing up a dialog in the same fashion would be a bad idea. Using the ammend previous commit is doable. Another option would be to have another checkbox on the merge dialog to say do the merge, but don't commit. (In reply to Jon Schewe from comment #2) > Current versions of git have you edit the merge messages by default now, so > I don't see why bringing up a dialog in the same fashion would be a bad idea. Hm, does it also do that when a merge happens as part of a pull? > Using the ammend previous commit is doable. Another option would be to have > another checkbox on the merge dialog to say do the merge, but don't commit. That's also already available in EGit 3.1, see the screenshot of the merge dialog here: https://wiki.eclipse.org/EGit/New_and_Noteworthy/3.1#Features (In reply to Robin Stocker from comment #3) > (In reply to Jon Schewe from comment #2) > > Current versions of git have you edit the merge messages by default now, so > > I don't see why bringing up a dialog in the same fashion would be a bad idea. > > Hm, does it also do that when a merge happens as part of a pull? > I don't know, I don't use pull, I always use fetch and merge. > > Using the ammend previous commit is doable. Another option would be to have > > another checkbox on the merge dialog to say do the merge, but don't commit. > > That's also already available in EGit 3.1, see the screenshot of the merge > dialog here: > > https://wiki.eclipse.org/EGit/New_and_Noteworthy/3.1#Features OK, I'll just need to wait for 3.1 then as I'm on 3.0. When should I expect 3.1 to show up in the update channels? (In reply to Jon Schewe from comment #4) > OK, I'll just need to wait for 3.1 then as I'm on 3.0. When should I expect > 3.1 to show up in the update channels? Kepler SR2 (4.3.2) should come with the upcoming EGit 3.2. If you want it now, you can also add the stable EGit update site and update, works nicely: http://download.eclipse.org/egit/updates Got it, then I don't have an issue with this. (In reply to Jon Schewe from comment #4) > OK, I'll just need to wait for 3.1 then as I'm on 3.0. When should I expect > 3.1 to show up in the update channels? 3.1 is available here http://www.eclipse.org/egit/download/ you may update your workbench using the egit main update site: http://download.eclipse.org/egit/updates Changing from FIXED to WORKSFORME as there are multiple ways to do this already, but showing a dialog was not implemented with this bug (so it's not FIXED). |