git/list[1] front-page[2] threads[3] people[4] search[5] about
 

refactoring a branch with e.g. meld how?

From
Britton Kerin <britton.kerin@gmail.com>
Date
Aug 4, 2016, 01:09 UTC
Message-ID
<CAC4O8c9uogrxVX-rqkdt9mL+afOsvSs5=aZCzuPmfB-z-m_3sg@mail.gmail.com>
I've been asked to seriously reorganize and compress a big branch (75 commits)

What I'd like to do is make branches foo_flattened with all commits and branch foo_reorganized starting at the ancestor, then work by incrementally doing meld/commit/meld/commit/etc from foo_flattened into foo_reorganized.

I hoped to use git difftool -d foo_flattened foo_reorganized, taking advantage of the symlink behavior on the right hand side, but it links the individual files not the entire working tree, which isn't too useful since a lot of the changes introduce files.

Is there a git command to help with this or should I just be making a copy of the entire foo_flattened tree and work from that?

I recall running across some command that I think was supposed to let you have coexisting working trees of multiple commits or something, but I can't find it now.

Britton
Message 1 of 1 in “refactoring a branch with e.g. meld how?”
  1. Britton KerinAug 4, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.