git - Combine an old merged branch into a single history -
i have master
branch, deleted merged
branch "redesign".
a - b - c - d - e (master) | | f - g - h (redesign)
is possible combine merged
"redesign" branch master
have single uniform history?
a - b - c - f - g - h (master)
i think git rebase --interactive
trick. on master branch do
git rebase --interactive <commit hash of b>
and pick every commit. if want reorder commits swap lines.
edit:
just found similar question community wiki answer: combining history of merged branches in git?
git merge branch
No comments:
Post a Comment