如何在Git上将未提交的更改从一个分支移动到另一个分支

Question

I want to move all changes that are in a branch relative to master to another branch.

I don't want them as commits just as changes so that i can modify them and remove some of the changes and commit as one. I don't want to retain the old committed history.

I tried git format-patch master --stdout > mypatch.path and git apply

but that applies as commits which i can't modify after that.

Answer 1

I would do this to move the changes from branch1 to branch2:

git checkout branch2

git merge --squash branch1

No commit has been created or "copied" between the branches. The changes can be modified before committing if need be.

Answer 2

If I understand what you want to do correctly, one way would be to start with your first branch:

git checkout branch1

Create a new branch from there:

git checkout -b branch2

Reset back to master, which will remove any commits that were made on branch1 , but leave the changes as unstaged:

git reset master

You can then modify the files further and commit them as one commit.