Edit Question - KnowledgeHub

Title Body

Suppose I have such tree: ... -- a -- b -- c -- d -- ... \ e -- a -- k and I want it become just ... -- a -- b -- c -- d -- ... I know how to attach branch name to "e". I know that what I'm going to do will change history, and this is bad. Also I guess I need to use something like rebase or filter-branch. But how exactly - I'm lost. Ok. Situation is following: I have rather big tree now (like this) s -- p -- r / a -- b -- c -- d -- e --- g -- w \ \ t -- p -- l y -- k but in my one of first commits (like to "b" for ex.) I added binary files, which makes whole repo very heavy. So I decided to take them away. I did it with filter-branch. And Now I have 2 long branches of commits identical to each other starting from second commit. s -- p -- r / a -- b -- c -- d -- e --- g -- w \ \ \ \ t -- p -- l y -- k \ \ s'-- p'-- r' \ / b'-- c'-- d'-- e'--- g'-- w' \ \ t'-- p'-- l' y'-- k' where b' is commit without binary file in it. So I can't do merge. I don't want this whole tree to be in history duplicated so.

Tags (comma-separated) Cancel