git-rebase

I have two (private) feature branches that I'm working on. a -- b -- c <-- Master \ \ \ d -- e <-- Branch1 \ f -- g <-- Branch2 After working on these branches a little while I've discovered that I need the changes from Branch2 in Branch1. I'd like to rebase the changes in Branch2 onto Branch1. I'd like to end up with the following: a -- b -- c <-- Master \ d -- e -- f -- g <-- Branch1 I'm pretty sure I need to rebase the second branch onto the first, but I'm not entirely sure about the correct syntax and which branch I should have checked out. Will this command produce the desired result?

edit The question boils down to "Can git rebase be instructed to rebase tags, too?" But an answer to the original question would also help. Asking How to prepend the past to a git repository? I followed these instructions . < edit >Then I rebased to include a file that was only in the snapshots, see here .< /edit > Since history was rewritten (by git filter-branch or git rebase or both?) all tags are still on the original time line* and I'd somehow like to move them to the new one. I think I made all commit-messages with tags unique so I could try writing a script that uses them, but a more

I am getting the following when running git status Your branch is ahead of 'origin/master' by 3 commits. I have read on some other post the way to fix this is run git pull --rebase but what exactly is rebase, will I lose data or is this simple way to sync with master? iberbeu You get that message because you made changes in your local master and you didn't push them to remote. You have several ways to "solve" it and it normally depends on how your workflow looks like: In a good workflow your remote copy of master should be the good one while your local copy of master is just a copy of the one

I have cloned project from master branch from remote repository remote_repo . I create new branch and I commit to that branch. Other programmers pushed to remote_repo to master branch. I need now to rebase my branch RB onto remote_repo master. How to do this ? What commands to type to terminal ? Frerich Raabe First fetch the new master from the upstream repository, then rebase your work branch on that: git fetch origin # Updates origin/master git rebase origin/master # Rebases current branch onto origin/master Update : Please see Paul Draper's answer for a more concise way to do the same -

Suppose we have the following revision graph: A-X-Z--B \ \-C with A preceding both B and C. Further suppose I rebase A from upstream, creating a new commit A*, and then rebase both B and C onto A*. The resulting revision graph is the following: A*-X'-Z'-B \ \-X"-Z"-C Note that the shared history is no longer shared. Is there a simple way to fix this, other than, say, rebasing B and then rebasing C onto Z' explicitly. In other words is there a better way to automatically rebase multiple branches at the same time in order to preserve shared history? It just seems a little bit awkward to have to