2. Git 基礎
3. 使用 Git 分支
4. 伺服器上的 Git
5. 分散式的 Git
7. Git 工具
10. Git Internals
3.6 使用 Git 分支 - 衍合
In Git, there are two main ways to integrate changes from one branch into another: the
merge and the
In this section you’ll learn what rebasing is, how to do it, why it’s a pretty amazing tool, and in what cases you won’t want to use it.
If you go back to an earlier example from 合併的基本用法, you can see that you diverged your work and made commits on two different branches.
The easiest way to integrate the branches, as we’ve already covered, is the
It performs a three-way merge between the two latest branch snapshots (
C4) and the most recent common ancestor of the two (
C2), creating a new snapshot (and commit).
However, there is another way: you can take the patch of the change that was introduced in
C4 and reapply it on top of
In Git, this is called rebasing.
rebase command, you can take all the changes that were committed on one branch and replay them on another one.
In this example, you’d run the following:
$ git checkout experiment $ git rebase master First, rewinding head to replay your work on top of it... Applying: added staged command
It works by going to the common ancestor of the two branches (the one you’re on and the one you’re rebasing onto), getting the diff introduced by each commit of the branch you’re on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.
At this point, you can go back to the
master branch and do a fast-forward merge.
$ git checkout master $ git merge experiment
Now, the snapshot pointed to by
C4' is exactly the same as the one that was pointed to by
C5 in the merge example.
There is no difference in the end product of the integration, but rebasing makes for a cleaner history.
If you examine the log of a rebased branch, it looks like a linear history: it appears that all the work happened in series, even when it originally happened in parallel.
Often, you’ll do this to make sure your commits apply cleanly on a remote branch – perhaps in a project to which you’re trying to contribute but that you don’t maintain.
In this case, you’d do your work in a branch and then rebase your work onto
origin/master when you were ready to submit your patches to the main project.
That way, the maintainer doesn’t have to do any integration work – just a fast-forward or a clean apply.
Note that the snapshot pointed to by the final commit you end up with, whether it’s the last of the rebased commits for a rebase or the final merge commit after a merge, is the same snapshot – it’s only the history that is different. Rebasing replays changes from one line of work onto another in the order they were introduced, whereas merging takes the endpoints and merges them together.
You can also have your rebase replay on something other than the rebase target branch.
Take a history like A history with a topic branch off another topic branch, for example.
You branched a topic branch (
server) to add some server-side functionality to your project, and made a commit.
Then, you branched off that to make the client-side changes (
client) and committed a few times.
Finally, you went back to your server branch and did a few more commits.
Suppose you decide that you want to merge your client-side changes into your mainline for a release, but you want to hold off on the server-side changes until it’s tested further.
You can take the changes on client that aren’t on server (
C9) and replay them on your
master branch by using the
--onto option of
$ git rebase --onto master server client
This basically says, “Check out the client branch, figure out the patches from the common ancestor of the
server branches, and then replay them onto
It’s a bit complex, but the result is pretty cool.
Now you can fast-forward your
master branch (see Fast-forwarding your master branch to include the client branch changes):
$ git checkout master $ git merge client
Let’s say you decide to pull in your server branch as well.
You can rebase the server branch onto the
master branch without having to check it out first by running
git rebase [basebranch] [topicbranch] – which checks out the topic branch (in this case,
server) for you and replays it onto the base branch (
$ git rebase master server
This replays your
server work on top of your
master work, as shown in Rebasing your server branch on top of your master branch.
Then, you can fast-forward the base branch (
$ git checkout master $ git merge server
You can remove the
server branches because all the work is integrated and you don’t need them anymore, leaving your history for this entire process looking like Final commit history:
$ git branch -d client $ git branch -d server
Ahh, but the bliss of rebasing isn’t without its drawbacks, which can be summed up in a single line:
Do not rebase commits that exist outside your repository.
If you follow that guideline, you’ll be fine. If you don’t, people will hate you, and you’ll be scorned by friends and family.
When you rebase stuff, you’re abandoning existing commits and creating new ones that are similar but different.
If you push commits somewhere and others pull them down and base work on them, and then you rewrite those commits with
git rebase and push them up again, your collaborators will have to re-merge their work and things will get messy when you try to pull their work back into yours.
Let’s look at an example of how rebasing work that you’ve made public can cause problems. Suppose you clone from a central server and then do some work off that. Your commit history looks like this:
Now, someone else does more work that includes a merge, and pushes that work to the central server. You fetch it and merge the new remote branch into your work, making your history look something like this:
Next, the person who pushed the merged work decides to go back and rebase their work instead; they do a
git push --force to overwrite the history on the server.
You then fetch from that server, bringing down the new commits.
Now you’re both in a pickle.
If you do a
git pull, you’ll create a merge commit which includes both lines of history, and your repository will look like this:
If you run a
git log when your history looks like this, you’ll see two commits that have the same author, date, and message, which will be confusing.
Furthermore, if you push this history back up to the server, you’ll reintroduce all those rebased commits to the central server, which can further confuse people.
It’s pretty safe to assume that the other developer doesn’t want
C6 to be in the history; that’s why they rebased in the first place.
Rebase When You Rebase
If you do find yourself in a situation like this, Git has some further magic that might help you out. If someone on your team force pushes changes that overwrite work that you’ve based work on, your challenge is to figure out what is yours and what they’ve rewritten.
It turns out that in addition to the commit SHA-1 checksum, Git also calculates a checksum that is based just on the patch introduced with the commit. This is called a “patch-id”.
If you pull down work that was rewritten and rebase it on top of the new commits from your partner, Git can often successfully figure out what is uniquely yours and apply them back on top of the new branch.
For instance, in the previous scenario, if instead of doing a merge when we’re at Someone pushes rebased commits, abandoning commits you’ve based your work on we run
git rebase teamone/master, Git will:
Determine what work is unique to our branch (C2, C3, C4, C6, C7)
Determine which are not merge commits (C2, C3, C4)
Determine which have not been rewritten into the target branch (just C2 and C3, since C4 is the same patch as C4')
Apply those commits to the top of
So instead of the result we see in You merge in the same work again into a new merge commit, we would end up with something more like Rebase on top of force-pushed rebase work..
This only works if C4 and C4' that your partner made are almost exactly the same patch. Otherwise the rebase won’t be able to tell that it’s a duplicate and will add another C4-like patch (which will probably fail to apply cleanly, since the changes would already be at least somewhat there).
You can also simplify this by running a
git pull --rebase instead of a normal
Or you could do it manually with a
git fetch followed by a
git rebase teamone/master in this case.
If you are using
git pull and want to make
--rebase the default, you can set the
pull.rebase config value with something like
git config --global pull.rebase true.
If you treat rebasing as a way to clean up and work with commits before you push them, and if you only rebase commits that have never been available publicly, then you’ll be fine. If you rebase commits that have already been pushed publicly, and people may have based work on those commits, then you may be in for some frustrating trouble, and the scorn of your teammates.
If you or a partner does find it necessary at some point, make sure everyone knows to run
git pull --rebase to try to make the pain after it happens a little bit simpler.
Now that you’ve seen rebasing and merging in action, you may be wondering which one is better. Before we can answer this, let’s step back a bit and talk about what history means.
One point of view on this is that your repository’s commit history is a record of what actually happened. It’s a historical document, valuable in its own right, and shouldn’t be tampered with. From this angle, changing the commit history is almost blasphemous; you’re lying about what actually transpired. So what if there was a messy series of merge commits? That’s how it happened, and the repository should preserve that for posterity.
The opposing point of view is that the commit history is the story of how your project was made. You wouldn’t publish the first draft of a book, and the manual for how to maintain your software deserves careful editing. This is the camp that uses tools like rebase and filter-branch to tell the story in the way that’s best for future readers.
Now, to the question of whether merging or rebasing is better: hopefully you’ll see that it’s not that simple. Git is a powerful tool, and allows you to do many things to and with your history, but every team and every project is different. Now that you know how both of these things work, it’s up to you to decide which one is best for your particular situation.
In general the way to get the best of both worlds is to rebase local changes you’ve made but haven’t shared yet before you push them in order to clean up your story, but never rebase anything you’ve pushed somewhere.