git rebase 到远程更新

发布于 2024-09-03 02:44:46 字数 688 浏览 7 评论 0原文

我与一个使用 git 进行源代码管理的小团队合作。最近，我们一直在做主题分支来跟踪功能，然后将它们合并到本地主库中，然后将它们推送到远程服务器上的中央 git 存储库。当 master 中没有进行任何更改时，这非常有效：我创建主题分支，提交它，将其合并到 master 中，然后推送。万岁。

然而，如果有人在我之前推送到原点，我的提交就不会快进。因此，合并提交随之发生。当主题分支需要与本地主分支合并以确保我的更改适用于现在的代码时，也会发生这种情况。因此，我们最终会得到无处不在的合并提交和与友谊手镯相媲美的 git 日志。

因此，变基是显而易见的选择。我想要的是：

创建包含多个提交的主题分支
签出 master 并拉动（快进，因为我还没有提交到 master）
将主题分支变基到 master 的新头
将主题变基到 master 上（因此主题从 master 开始） head），将主人带到我的主题 head

我目前的做法如下：

git checkout master
git rebase master topic_1
git rebase topic_1 topic_2
git checkout master
git rebase topic_2
git branch -d topic_1 topic_2

有没有更快的方法来做到这一点？

原文

I work with a small team that uses git for source code management. Recently, we have been doing topic branches to keep track of features then merging them into master locally then pushing them to a central git repository on a remote server. This works great when no changes have been made in master: I create my topic branch, commit it, merge it into master, then push. Hooray.

However, if someone has pushed to origin before I do, my commits are not fast-forward. Thus a merge commit ensues. This also happens when a topic branch needs to merge with master locally to ensure my changes work with the code as of now. So, we end up with merge commits everywhere and a git log rivaling a friendship bracelet.

So, rebasing is the obvious choice. What I would like is to:

create topic branches holding several commits
checkout master and pull (fast-forward because i haven't committed to master)
rebase topic branches onto the new head of master
rebase topics against master(so the topics start at masters head), bringing master up to my topic head

My way of doing this currently is listed below:

git checkout master
git rebase master topic_1
git rebase topic_1 topic_2
git checkout master
git rebase topic_2
git branch -d topic_1 topic_2

Is there a faster way to do this?

分享到QQ

分享到微博

如果你对这篇内容有疑问，欢迎到本站社区发帖提问参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。

发布评论

需要登录才能够评论，你可以免费注册一个本站的账号。

雨轻弹 2024-09-10 02:44:47

随着时间的推移，我发现我最喜欢的解决方案是：

git checkout topic
# make [n] commits
git rebase -i HEAD~[n] #clean up time
git checkout master
git pull --rebase
git checkout topic
git rebase master
git checkout master
git merge topic
git push origin

I have found, over time, my favorite solution is:

git checkout topic
# make [n] commits
git rebase -i HEAD~[n] #clean up time
git checkout master
git pull --rebase
git checkout topic
git rebase master
git checkout master
git merge topic
git push origin

回复收藏 0 原文

三月梨花 2024-09-10 02:44:47

您还可以仅针对最新的 master 进行变基

git checkout topic_1
git rebase refs/remotes/origin/master

，这消除了拉取的需要（至少直到您的功能分支的 EOL 为止）。我们的流程使用 GitHub 拉取请求，因此我永远不需要在本地执行此操作。

You can also just rebase against the up-to-date master

git checkout topic_1
git rebase refs/remotes/origin/master

Which obviates the need for the pull (at least until the EOL of your feature branch). Our process uses GitHub pull requests so I never need to do that locally.

回复收藏 0 原文