{"thread":{"id":"43002","subject":"refactoring a branch with e.g. meld how?","startedAt":"2016-08-04T01:11:22Z","lastAt":"2016-08-04T01:11:22Z","messageCount":1,"participants":["Britton Kerin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"293058","messageId":"CAC4O8c9uogrxVX-rqkdt9mL+afOsvSs5=aZCzuPmfB-z-m_3sg@mail.gmail.com","threadId":"43002","inReplyTo":null,"subject":"refactoring a branch with e.g. meld how?","fromName":"Britton Kerin","fromEmail":"britton.kerin@gmail.com","sentAt":"2016-08-04T01:09:50Z","receivedAt":"2016-08-04T01:11:22Z","isPatch":false,"sender":{"key":"britton.kerin@gmail.com","avatar":"https://avatars.githubusercontent.com/u/7434164?v=4"},"body":"I've been asked to seriously reorganize and compress a big branch (75 commits)\n\nWhat I'd like to do is make branches foo_flattened with all commits\nand branch foo_reorganized\nstarting at the ancestor, then work by incrementally doing\nmeld/commit/meld/commit/etc from foo_flattened into foo_reorganized.\n\nI hoped to use git difftool -d foo_flattened foo_reorganized, taking\nadvantage of the symlink behavior on the right hand side, but it links\nthe individual files not the entire working tree, which isn't too\nuseful since a lot of the changes introduce files.\n\nIs there a git command to help with this or should I just be making a\ncopy of the entire foo_flattened tree and work from that?\n\nI recall running across some command that I think was supposed to let\nyou have coexisting working trees of multiple commits or something,\nbut I can't find it now.\n\nBritton\n"}]}