{"thread":{"id":"19185","subject":"Question about rewrite commits","startedAt":"2009-05-05T11:45:15Z","lastAt":"2009-05-05T19:46:25Z","messageCount":4,"participants":["Anner van Hardenbroek","Ferry Huberts (Pelagic)","Dirk Süsserott"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113032","messageId":"15aa6cf30905050445k21f8317bt7be65857604cc101@mail.gmail.com","threadId":"19185","inReplyTo":null,"subject":"Question about rewrite commits","fromName":"Anner van Hardenbroek","fromEmail":"dwlnetnl@gmail.com","sentAt":"2009-05-05T11:45:15Z","receivedAt":"2009-05-05T11:45:15Z","isPatch":false,"sender":{"key":"dwlnetnl@gmail.com","avatar":null},"body":"Hi!\n\nI've a question about rewriting commits. I'd like to change the\nbranches so that \"Introduced BTRmxSoapArgument, second fase + code\ncleanup.\" is right below (a straight vertical line) \"No HTML errors\nbecause we have nice ones!\". How can I do that?\n\nThanks,\nAnner.\n\n--\nAnner van Hardenbroek,\ndwlnetnl@gmail.com\n"},{"id":"113036","messageId":"4A003677.3040802@pelagic.nl","threadId":"19185","inReplyTo":"15aa6cf30905050445k21f8317bt7be65857604cc101@mail.gmail.com","subject":"Re: Question about rewrite commits","fromName":"Ferry Huberts (Pelagic)","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-05-05T12:52:07Z","receivedAt":"2009-05-05T12:52:07Z","isPatch":false,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"Anner van Hardenbroek wrote:\n> Hi!\n> \n> I've a question about rewriting commits. I'd like to change the\n> branches so that \"Introduced BTRmxSoapArgument, second fase + code\n> cleanup.\" is right below (a straight vertical line) \"No HTML errors\n> because we have nice ones!\".\n\nit already is :-)\n\nor did you mean that you want to get rid of the merge? that's an\nentirely different question\n"},{"id":"113038","messageId":"15aa6cf30905050627i5c8f4a8ftb33444f0a292ac6f@mail.gmail.com","threadId":"19185","inReplyTo":"4A003677.3040802@pelagic.nl","subject":"Re: Question about rewrite commits","fromName":"Anner van Hardenbroek","fromEmail":"dwlnetnl@users.sourceforge.net","sentAt":"2009-05-05T13:27:19Z","receivedAt":"2009-05-05T13:27:19Z","isPatch":false,"sender":{"key":"dwlnetnl@users.sourceforge.net","avatar":null},"body":"Yeah, okay but I'd like it visually.\n\nOn Tue, May 5, 2009 at 2:52 PM, Ferry Huberts (Pelagic)\n<ferry.huberts@pelagic.nl> wrote:\n>\n> Anner van Hardenbroek wrote:\n> > Hi!\n> >\n> > I've a question about rewriting commits. I'd like to change the\n> > branches so that \"Introduced BTRmxSoapArgument, second fase + code\n> > cleanup.\" is right below (a straight vertical line) \"No HTML errors\n> > because we have nice ones!\".\n>\n> it already is :-)\n>\n> or did you mean that you want to get rid of the merge? that's an\n> entirely different question\n\n\n\n--\nAnner van Hardenbroek,\ndwlnetnl@users.sourceforge.net\n"},{"id":"113052","messageId":"4A009791.6010704@dirk.my1.cc","threadId":"19185","inReplyTo":"15aa6cf30905050445k21f8317bt7be65857604cc101@mail.gmail.com","subject":"Re: Question about rewrite commits","fromName":"Dirk Süsserott","fromEmail":"newsletter@dirk.my1.cc","sentAt":"2009-05-05T19:46:25Z","receivedAt":"2009-05-05T19:46:25Z","isPatch":false,"sender":{"key":"newsletter@dirk.my1.cc","avatar":null},"body":"Hi Anner,\n\nI had these 'cosmetic' problems as well and did the surgery like this:\n\nI assume that your commits\n    'Introduced...',\n    'No HTML...', and\n    'A page can now ...'\nare on branch 'master' and the righthand track is on branch \n'console-mvc' which starts at 'Introduced...'.\nFinally you did 'git checkout master; git merge console-mvc'.\n\nI did the following:\n     - give a tag (say 'foo') to the 'No HTML...' commit\n     - rebase the console-mvc branch to that tag:\n         $ git rebase foo console-mvc\n       this will yield to a weird road map in gitk. Don't bother.\n     - rebase the master to the new console-mvc branch:\n         $ git rebase console-mvc master\n       the history will now be linear.\n     - remove the tag 'foo'\n\nYou may, of course, omit the tagging when you know the sha1's of the \ncommits. In your case you will, as they're displayed in gitk.\n[ In theory there's a way to identify commits by their commit message \n(see manpage of git-rev-parse), but I didn't make it work. As I \nunderstood \"git show :/foo\" would mention the latest commit whose commit \nmessage starts with 'foo', but I only got error messages. ]\n\nBe noticed that rewriting history isn't a good idea if you already have \npublished your work. Your coworkers may get disturbed. ;-)\n\nHope this helps,\n\n     Dirk\n\n\nAm 05.05.2009 13:45 schrieb Anner van Hardenbroek:\n> Hi!\n> \n> I've a question about rewriting commits. I'd like to change the\n> branches so that \"Introduced BTRmxSoapArgument, second fase + code\n> cleanup.\" is right below (a straight vertical line) \"No HTML errors\n> because we have nice ones!\". How can I do that?\n> \n> Thanks,\n> Anner.\n> \n> --\n> Anner van Hardenbroek,\n> dwlnetnl@gmail.com\n> \n> \n> ------------------------------------------------------------------------\n> \n"}]}