将现有的，未提交的工作移动到Git中的新分支-Moveexisting,uncommittedworktoanewbranchinGit

2990  

Use the following:

使用以下内容：

git checkout -b 

This will leave your current branch as is, create and checkout a new branch and keep all your changes. You can then make a commit with:

这将使您的当前分支保持原样，创建并签出新分支并保留所有更改。然后您可以使用以下命令进行提交：

git add 

and commit to your new branch with:

并提交到您的新分支：

git commit -m ""

The changes in the working directory and changes staged in index do not belong to any branch yet. This changes where those changes would end in.

工作目录中的更改和索引中的更改不属于任何分支。这会改变这些变化的结果。

You don't reset your original branch, it stays as it is. The last commit on will still be the same. Therefore you checkout -b and then commit.

您没有重置原始分支，它保持不变。 上的最后一次提交仍然是相同的。因此，您签出-b然后提交。

256  

Alternatively:

或者：

1. Save current changes to a temp stash:

   将当前更改保存到临时存储：

   $ git stash

   $ git stash

2. Create a new branch based on this stash, and switch to the new branch:

   基于此存储创建新分支，并切换到新分支：

   $ git stash branch stash@{0}

   $ git stash branch stash @ {0}

Tip: use tab key to reduce typing the stash name.

提示：使用Tab键减少键入存储名称。

37  

If you have been making commits on your main branch while you coded, but you now want to move those commits to a different branch:

如果您在编码时已在主分支上进行提交，但现在要将这些提交移动到其他分支：

1. Copy your current history onto a new branch, bringing along any uncommitted changes too:

   将当前历史记录复制到新分支，同时带来任何未提交的更改：

   git checkout -b 
   

2. Now force the original "messy" branch to roll back: (without switching to it)

   现在强制原来的“凌乱”分支回滚:(没有切换到它）

   git branch -f  
   

   For example:

   例如：

   git branch -f master origin/master
   

   or if you had made 4 commits:

   或者如果你做了4次提交：

   git branch -f master HEAD~4
   

Warning: It appears that git branch -f master origin/master will reset the tracking information for that branch. So if you have configured your master branch to push to somewhere other than origin/master then that configuration will be lost.

警告：看来git branch -f master origin / master将重置该分支的跟踪信息。因此，如果您已将主分支配置为推送到origin / master之外的某个位置，那么该配置将丢失。

An alternative is to use this reset technique. But those instructions will discard any uncommitted changes you have. If you want to keep those, stash them first and unstash them at the end.

另一种方法是使用这种重置技术。但是这些说明将丢弃您拥有的任何未提交的更改。如果你想保留它们，先将它们藏起来并在最后取出它们。

16  

If you commit it, you could also cherry-pick the single commit ID. I do this often when I start work in master, and then want to create a local branch before I push up to my origin/.

如果你提交它，你也可以挑选单个提交ID。当我开始在master中工作时，我经常这样做，然后想要在我推送到我的原点之前创建一个本地分支。

git cherry-pick 

There is alot you can do with cherry-pick, as described here, but this could be a use-case for you.

如此处所述，你可以使用樱桃挑选，但这可能是一个用例。

0  

The common scenario is the following: I forgot to create the new branch for the new feature, and was doing all the work in the old feature branch. I have commited all the "old" work to the master branch, and I want my new branch to grow from the "master". I have not made a single commit of my new work. Here is the branch structure: "master"->"Old_feature"

常见的情况如下：我忘了为新功能创建新分支，并且正在旧功能分支中完成所有工作。我已将所有“旧”工作提交给主分支，我希望我的新分支从“主”增长。我没有单独提交我的新作品。这是分支结构：“master” - >“Old_feature”

git stash 
git checkout master
git checkout -b "New_branch"
git stash apply