是否有可能将变更从一个分支提交到另一个分支。

假设我在BRANCH1中提交了更改,并希望将它们推到BRANCH2。

从BRANCH1中,这样做是否有效:

git push origin **BRANCH2**

然后重置BRANCH1?


当前回答

差不多可以了。

当推入一个非默认的分支时,你需要指定源ref和目标ref:

git push origin branch1:branch2

Or

git push <remote> <branch with new changes>:<branch you are pushing to> 

其他回答

在我的例子中,我有一个本地提交,它没有推送到origin\master,而是提交到我的本地主分支。这个本地提交现在应该推到另一个分支。

使用Git扩展,你可以做这样的事情:

(Create if not existing and) checkout new branch, where you want to push your commit. Select the commit from the history, which should get commited & pushed to this branch. Right click and select Cherry pick commit. Press Cherry pick button afterwards. The selected commit get's applied to your checked out branch. Now commit and push it. Check out your old branch, with the faulty commit. Hard reset this branch to the second last commit, where everything was ok (be aware what are you doing here!). You can do that via right click on the second last commit and select Reset current branch to here. Confirm the opperation, if you know what you are doing.

您也可以在GIT命令行上执行此操作。例子摘自大卫·克里斯滕森:

I think you'll find git cherry-pick + git reset to be a much quicker workflow: Using your same scenario, with "feature" being the branch with the top-most commit being incorrect, it'd be much easier to do this: git checkout master git cherry-pick feature git checkout feature git reset --hard HEAD^ Saves quite a bit of work, and is the scenario that git cherry-pick was designed to handle. I'll also note that this will work as well if it's not the topmost commit; you just need a commitish for the argument to cherry-pick, via: git checkout master git cherry-pick $sha1 git checkout feature git rebase -i ... # whack the specific commit from the history

@SLaks的答案是小道具,这对我来说基本适用。但是在分支有不同头的情况下。一个方便的方法是使用樱桃。

git登录Branch1与您的更改 复制提交SHA您的更改 Git checkout branch2 -在这里应用您的更改 git选择SHA_OF_COMMIT_FROM_STEP_2

这很容易做到

git status
git add .
git commit -m "any commit"
git pull origin master 
git push origin master:development # assuming 'development' is the target branch name.

这很简单。假设您已经对本地和远程驻留的分支A进行了更改,但是您想将这些更改推到不存在的分支B。

步骤01:创建并切换到新的分支B

git checkout -b

步骤02:在新的本地分支中添加更改

Git添加。//或指定文件

步骤03:提交更改

Git commit -m commit_message

步骤04:将更改推送到新的分支B。下面的命令也将远程创建一个新的分支B

git push origin B

现在,你可以从bitbucket中验证分支B将比分支A多提交一次,当你签出分支A时,这些更改将不会存在,因为这些更改已被推入分支B。

注意:如果您已经将更改提交到分支A中,然后您想将这些更改转移到新的分支B中,那么您必须首先重置这些更改。# HappyLearning

我用git push origin branch1:branch2命令得到了一个糟糕的结果:

在我的例子中,branch2被删除了,branch1被更新了一些新的变化。

因此,如果你只想把从branch1推到branch2上的更改,试试下面的步骤:

在branch1上:git添加。 git在branch1上提交-m 'comments' 在branch1上:git push origin branch1 在branch2上:git拉动起源branch1 在branch1上:恢复到上一次提交。