如何将一个分支从分支的头提交到新分支中，而合并后又不丢弃它们呢？

Question

I've made some commits on a branch I was not supposed to!

Sprint 1 Branch

• Commit #4
• Commit #3
• Commit #2
• Commit #1

I want to move Commits #2 - #4 into a Hot Fix Branch so that they can be merged back into the Sprint 1 Branch at a later date. It is important that whatever I do on the Sprint 1 Branch to get rid of these commits temporarily won't take precedence over these commits when I merge them back in (eg reverting them after creating a hotfix branch for them). How can I do this?

Answer 1

As always, in git, there are many possibilities to achieve something. So, let's say you have 4 commits on branch sprint and you want to move the last commits to a branch fix. To simulate your problem, I created the sprint branch as follows:

git checkout -b sprint
touch c1 c2 c3 c4
git add c1
git commit -m "commit 1"
git add c2
git commit -m "commit 2"
git add c3
git commit -m "commit 3"
git add c4
git commit -m "commit 4"
git push origin sprint

Now, instead of moving commits, we just create the fix branch from the head of the sprint branch:

git checkout -b fix
git push origin fix

Now, we reset the sprint branch to the first commit.

git checkout sprint
git log --oneline # copy the hash of the first commit, say f58f8d8
git reset --hard f58f8d8
git push -f origin sprint # -f (force option) is needed because of the hard reset

So, the fix branch has now all the commits, and the sprint branch only has the first commit, which, I understand, is what you needed.

EDIT : you need RW+ permissions to use the -f or --force option (see comments below).

Answer 2

Use git rebase for that case. It rebases commits onto another branch.