{"thread":{"id":"14196","subject":"Re: An alternate model for preparing partial commits","startedAt":"2008-06-28T01:17:24Z","lastAt":"2008-06-28T01:56:08Z","messageCount":2,"participants":["Theodore Tso","Miklos Vajna"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"81525","messageId":"20080628011723.GB15463@mit.edu","threadId":"14196","inReplyTo":null,"subject":"Re: An alternate model for preparing partial commits","fromName":"Theodore Tso","fromEmail":"tytso@mit.edu","sentAt":"2008-06-28T01:17:24Z","receivedAt":"2008-06-28T01:17:24Z","isPatch":false,"sender":{"key":"tytso@mit.edu","avatar":"https://avatars.githubusercontent.com/u/51416?v=4"},"body":"On Fri, Jun 27, 2008 at 08:29:15PM -0000, David Jeske wrote:\n> git has all the concepts I want except one. However, it makes the process\n> pretty manual. Here is an idea about automating it. I'll talk about that one\n> new concept at the bottom.\n> \n> I think of this as reorder/merge/split...\n> \n> reorder: Picture that a list of commits on this branch opens in an\n> editor. You are free to rearrange the lines in any order you want,\n> but you have to keep all the lines. When you are done reordering the\n> lines, the tool creates a new topic branch and applies the changes\n> (probably with cherrypick) to the new topic branch. If there are no\n> conflicts, you're done.....\n\nRead the man page for for \"git rebase --interactive\".  I think you\nwill find that it handles reording and merging (its called squashing)\nalready.\n\nSplitting patches is harder to do and probably is one of the things\nyou have to do manually.\n\n\t\t\t\t\t\t- Ted\n"},{"id":"81527","messageId":"20080628015608.GF2058@genesis.frugalware.org","threadId":"14196","inReplyTo":"20080628011723.GB15463@mit.edu","subject":"Re: An alternate model for preparing partial commits","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-28T01:56:08Z","receivedAt":"2008-06-28T01:56:08Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Fri, Jun 27, 2008 at 09:17:24PM -0400, Theodore Tso <tytso@mit.edu> wrote:\n> Splitting patches is harder to do and probably is one of the things\n> you have to do manually.\n\nOr not that hard:\n\nhttp://git.kernel.org/?p=git/git.git;a=blob;f=Documentation/git-rebase.txt;hb=HEAD#l363\n\n:-)\n"}]}