{"thread":{"id":"14822","subject":"small merge tool for temporary merges","startedAt":"2008-08-03T16:34:15Z","lastAt":"2008-08-10T10:46:08Z","messageCount":3,"participants":["Marc Weber","Petr Baudis","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"86084","messageId":"20080803163415.GB14513@gmx.de","threadId":"14822","inReplyTo":null,"subject":"small merge tool for temporary merges","fromName":"Marc Weber","fromEmail":"marco-oweber@gmx.de","sentAt":"2008-08-03T16:34:15Z","receivedAt":"2008-08-03T16:34:15Z","isPatch":false,"sender":{"key":"marco-oweber@gmx.de","avatar":null},"body":"Hi at all,\n\nI'd like to announce the exisntance of my small git test merge tool.\n\nAfter reading \n Linux kernel mailing list may remember that Linus complained about such\n too frequent test merges when a subsystem maintainer asked to pull from\n a branch full of \"useless merges\"\nin the man page of git-rerere I had to start it..\n\n$ git clone git://mawercer.de/git-test-merge\n\n=============  =======================================================\nsmall HOWTO:\n\n$ alias gtm=git-test-merge\n\n$ gtm h # show the help\n$ gtm s mytestmerge branch{1,2} # define testmerge \"mytestmerge\" which is formed by merging branch1 and branch2\n$ gtm u mytestmerge # merge first using octopus, if it fails merge with\n                    # the previous merge result with next branch until\n                    # no branches are left to merge\n\nIf the merge fails you can resolve the conflicts and run\n$ gtm c # you don't have to git-add the resolved files, will be done by the script\n\nI hope its useful for you as well. If you have patches you may push them\ninstantly.\nIf it's obsolete because there is a better tool I appreciat you pointing\nme to it\n\nSincerly\nMarc Weber\n"},{"id":"86086","messageId":"20080803165805.GY32184@machine.or.cz","threadId":"14822","inReplyTo":"20080803163415.GB14513@gmx.de","subject":"Re: small merge tool for temporary merges","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2008-08-03T16:58:05Z","receivedAt":"2008-08-03T16:58:05Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"  Hi,\n\nOn Sun, Aug 03, 2008 at 06:34:15PM +0200, Marc Weber wrote:\n> I'd like to announce the exisntance of my small git test merge tool.\n> \n> After reading \n>  Linux kernel mailing list may remember that Linus complained about such\n>  too frequent test merges when a subsystem maintainer asked to pull from\n>  a branch full of \"useless merges\"\n> in the man page of git-rerere I had to start it..\n> \n> $ git clone git://mawercer.de/git-test-merge\n\n  for the mildly curious ones, your friendly gitweb provider service\noffers\n\n\thttp://repo.or.cz/w/git-test-merge.git\n\n\t\t\t\tPetr \"Pasky\" Baudis\n"},{"id":"86659","messageId":"m3ej4xtafq.fsf@localhost.localdomain","threadId":"14822","inReplyTo":"20080803163415.GB14513@gmx.de","subject":"Re: small merge tool for temporary merges","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-08-10T10:46:08Z","receivedAt":"2008-08-10T10:46:08Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Marc Weber <marco-oweber@gmx.de> writes:\n\n> I'd like to announce the exisntance of my small git test merge tool.\n> \n> After reading \n>  Linux kernel mailing list may remember that Linus complained about such\n>  too frequent test merges when a subsystem maintainer asked to pull from\n>  a branch full of \"useless merges\"\n> in the man page of git-rerere I had to start it..\n\nCould you add it to http://git.or.cz/gitwiki/InterfacesFrontendsAndTools\nwhen you feel it is ready (for example using '/bin/bash' or something\nlike that in the she-bang (#!) line)?  TIA.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"}]}