I'm using some code for which no SCM is used+ and receive occasional updates in the form of all project files although only some of them have been changed only a bit. Up till now I just put my own changes in a git repo and solved these "updates" with a manual git add -p
session which is getting more and more annoying with the amount of my own changes (those that are not determined to be published yet) increasing, and since luckily I did git commit --author "the others"
for aforementioned "patches", I'd like to know:
如何将一位作者所做的所有提交分成一个新分支?
(在这种情况下我不介意重写历史记录,该存储库仅供我使用)
理想的解决方案包括在每个“补丁”之后将其他人的分支合并到我的分支中,但现在最后的最终合并可能就足够了。
+ yes, the Jedi did feel you cringe there
我最近为某人做了这个:
git checkout -b other_work <sha1_of_where_to_rebase>
git log --reverse --author=others --format=%H <sha1_range> | xargs -n 1 git cherry-pick
本文内容由网友自发贡献,版权归原作者所有,本站不承担相应法律责任。如您发现有涉嫌抄袭侵权的内容,请联系:hwhale#tublm.com(使用前将#替换为@)