Git - rebasing to a particular tag

git rebase git-rebase git-tag
MartyMacGyver picture MartyMacGyver · Sep 18, 2012 · Viewed 17.6k times · Source

(This seems like it should be very easy to do, yet I'm coming up empty on searches so far.)

I have a body of code from an upstream source, with various versions tagged in it on various branches.

I am working on my "develop" branch which was based on tag "v1.0". many versions have come out since then, but while "v2.0" is interesting, I want to rebase my develop branch to "v1.5" and continue working there (assume I don't plan to feed that back upstream). Maybe later I'll rebase it again to "v2.0".

(For this purpose assume "v1.x"s are all tags on the same branch. For extra credit we can assume "v2.0" is a tag on another branch.)

I was able to create the initial "develop" branch based on the "v1.0" tag easily enough, but rebase appears to only work with branches. Can't one rebase using tags as well? If not, what's the right way to accomplish that (so as to have exactly the same effect as rebasing to a particular tag)?

Answer

Karl Bielefeldt picture Karl Bielefeldt · Sep 18, 2012

You would use the following command:

git rebase --onto v1.5 v1.0 develop

The develop part of the command must be a branch, but the other two can be whatever you want.

Related questions

How to "rebase tags" in git?

Suppose I have the following simple git repository: a single branch, some commits one after another, a couple of them having been tagged (with annotated tags) after committing each of them, and then one day I decide I want to …

Read More
Undoing a git rebase

Does anybody know how to easily undo a git rebase? The only way that comes to mind is to go at it manually: git checkout the commit parent to both of the branches then create a temp branch from there …

Read More
How to squash all git commits into one?

How do you squash your entire repository down to the first commit? I can rebase to the first commit, but that would leave me with 2 commits. Is there a way to reference the commit before the first one?

Read More