* refactoring a branch with e.g. meld how?
@ 2016-08-04 1:09 Britton Kerin
0 siblings, 0 replies; only message in thread
From: Britton Kerin @ 2016-08-04 1:09 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-08-04 1:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-04 1:09 refactoring a branch with e.g. meld how? Britton Kerin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).