将多个不相关的未提交的更改移到多个分支

Question

Some files have been changed and some added, and nothing committed to master. I would like to checkout a new branch "login_fix" and commit the changes to two files to that branch (and probably merge it back into master immediately if the fix works). The rest of the files, some new and some modified, I would either commit to a different new branch, "big_mess," or I guess leave as uncommitted files if that is even possible.

Can I do that with git commands?

My other option is to tar all these files, git reset --hard HEAD , and then untar the files somewhere else and copy in the new files for each branch I want to create out of them.

git status shows:

On branch master
Your branch is up-to-date with 'origin/master'.

And it shows about 10 modified files and 6 added files, 2 of which appear to be renamed backup copies of files that were modified.

Answer 1

Yes, you can. Do the following

On the "login_fix" branch do

git commit <file_1> <file_2>

Get the commit id(SHA value) of above commit using

git log

Now go to your master and do following. The "SHA_value" is the commit id you got from above "git log" command.

git cherry-pick <SHA_value>

If you want to leave the remaining files as uncommitted then you do not need to do anything. If you want to commit them to the branch "big_mess", then go to that branch and do

git commit <list_of_remaining_files>