是否有可能将变更从一个分支提交到另一个分支。
假设我在BRANCH1中提交了更改,并希望将它们推到BRANCH2。
从BRANCH1中,这样做是否有效:
git push origin **BRANCH2**
然后重置BRANCH1?
是否有可能将变更从一个分支提交到另一个分支。
假设我在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>
其他回答
当然,尽管它只在BRANCH2的快进或强制时才会工作。这样做的正确语法是
git push <remote> <source branch>:<dest branch>
查看git push手册页上关于“refspec”的描述,了解更多关于它如何工作的详细信息。还要注意,强制推送和重置都是“重写历史”的操作,心脏不好的人不应该尝试,除非你绝对确定你对任何远程存储库和其他拥有同一项目的分叉/克隆的人知道你在做什么。
当您将代码推到另一个分支时,只需遵循下面的git命令。记住demo是我的另一个分支名,你可以用你的分支名替换。
git push origin master:demo
差不多可以了。
当推入一个非默认的分支时,你需要指定源ref和目标ref:
git push origin branch1:branch2
Or
git push <remote> <branch with new changes>:<branch you are pushing to>
这很容易做到
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.
在我的例子中,我有一个本地提交,它没有推送到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