{"thread":{"id":"8073","subject":"Re: Merging commits together into a super-commit","startedAt":"2007-05-10T21:55:15Z","lastAt":"2007-05-12T13:02:10Z","messageCount":4,"participants":["linux@horizon.com","Alex Riesen","Eugine Kosenko","Jan Hudec"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"41789","messageId":"20070510215515.3084.qmail@science.horizon.com","threadId":"8073","inReplyTo":null,"subject":"Re: Merging commits together into a super-commit","fromName":"","fromEmail":"linux@horizon.com","sentAt":"2007-05-10T21:55:15Z","receivedAt":"2007-05-10T21:55:15Z","isPatch":false,"sender":{"key":"linux@horizon.com","avatar":null},"body":"Er... why is everyone making this so complex?\n\ngit checkout trunk\t# Switch to \"trunk\"\ngit checkout branch .\t# Overwrite with \"branch\", but stay on \"trunk\"\ngit commit\n\nNow branch is the same tree object as \"branch\", but without the history.\n\nOf course, you could be even nastier and di a direct\n\ngit-commit-tree branch^{tree} -p HEAD < commit_message\n\nBut that's not really necessary.\n\n\nStarting from the branch, using the high-level commands is a bit awkward,\nbut it's easy enough to:\n\ngit-update-ref HEAD trunk\ngit-commit\n"},{"id":"41830","messageId":"81b0412b0705110454w5b18c267x17e82453e736f0b8@mail.gmail.com","threadId":"8073","inReplyTo":"20070510215515.3084.qmail@science.horizon.com","subject":"Re: Merging commits together into a super-commit","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-05-11T11:54:14Z","receivedAt":"2007-05-11T11:54:14Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 10 May 2007 17:55:15 -0400, linux@horizon.com <linux@horizon.com> wrote:\n> Er... why is everyone making this so complex?\n>\n> git checkout trunk      # Switch to \"trunk\"\n> git checkout branch .   # Overwrite with \"branch\", but stay on \"trunk\"\n> git commit\n>\n> Now branch is the same tree object as \"branch\", but without the history.\n>\n> Of course, you could be even nastier and di a direct\n>\n> git-commit-tree branch^{tree} -p HEAD < commit_message\n>\n\nAnd it is not enough. Authorship information is lost. And you\nhave to be damn sure the \"branch\" starts directly at HEAD,\notherwise everything HEAD..branch is lost. It is complex\nif you want it right.\n"},{"id":"41831","messageId":"9909dee80705110541m13c4035tc8338e179d6bec9b@mail.gmail.com","threadId":"8073","inReplyTo":"9909dee80705110537j7e6d1426p7723c110c0a2c667@mail.gmail.com","subject":"Merging commits together into a super-commit","fromName":"Eugine Kosenko","fromEmail":"eugine.kosenko@gmail.com","sentAt":"2007-05-11T12:41:45Z","receivedAt":"2007-05-11T12:41:45Z","isPatch":false,"sender":{"key":"eugine.kosenko@gmail.com","avatar":null},"body":"2007/5/11, Alex Riesen <raa.lkml@gmail.com>:\n> And it is not enough. Authorship information is lost.\n\nIf one dare to make such super-commit, he would be the author of the\nwhole couple of changes.\n\n> And you have to be damn sure the \"branch\" starts directly at HEAD,\n> otherwise everything HEAD..branch is lost. It is complex\n> if you want it right.\n\nI used to make git-rebase to add extra commits after this.\n"},{"id":"41918","messageId":"20070512130210.GA32764@efreet.light.src","threadId":"8073","inReplyTo":"9909dee80705110541m13c4035tc8338e179d6bec9b@mail.gmail.com","subject":"Re: Merging commits together into a super-commit","fromName":"Jan Hudec","fromEmail":"bulb@ucw.cz","sentAt":"2007-05-12T13:02:10Z","receivedAt":"2007-05-12T13:02:10Z","isPatch":false,"sender":{"key":"bulb@ucw.cz","avatar":null},"body":"On Fri, May 11, 2007 at 15:41:45 +0300, Eugine Kosenko wrote:\n> 2007/5/11, Alex Riesen <raa.lkml@gmail.com>:\n> >And it is not enough. Authorship information is lost.\n> \n> If one dare to make such super-commit, he would be the author of the\n> whole couple of changes.\n\nNo, he would not. He would be committer, but the change would still be based\non the work of the original authors and therefore would have to be attributed\nto them (and especially they would still remain copyright holders).\n\n-- \n\t\t\t\t\t\t Jan 'Bulb' Hudec <bulb@ucw.cz>\n"}]}