How to rebase one Git repository onto another one?

by

If A and B are not the same repo (you created B by using the latest working copy you had), you have to use a graft to pretend that they have common history.

Let’s assume you’ve added A as a remote for B as per VonC’s answer, and the repo looks like this1:

~/B$ git tnylog 
* 6506232 (HEAD, master) Latest work on B
* 799d6ae Imported backup from USB stick
~/B$ git tnylog A/master
* 33b5b16 (A/master) Head of A
* 6092517 Initial commit

Create a graft telling the root of B that its parent is the head of A:

echo '799d6aeb41095a8469d0a12167de8b45db02459c 33b5b16dde3af6f5592c2ca6a1a51d2e97357060' \
 >> .git/info/grafts

Now the two histories above will appear as one when you request the history for B. Making the graft permanent is a simple git filter-branch with no arguments. After the filter-branch, though, you aren’t on any branch, so you should git branch -D master; git checkout -b master.

1 git tnylog = git log --oneline --graph --decorate

More Related Contents:

  1. How do you merge two Git repositories?
  2. What is the difference between merge –squash and rebase?
  3. What’s the difference between ‘git merge’ and ‘git rebase’?
  4. git cherry-pick says “…38c74d is a merge but no -m option was given”
  5. Moving Git repository content to another repository preserving history
  6. Git – Ignore files during merge
  7. Rebasing a Git merge commit
  8. Can I make fast forwarding be off by default in git?
  9. Merge changes from remote github repository to your local repository
  10. git rebase and git push: non-fast forward, why use?
  11. How do I use `git rebase -i` after `git merge` without messing things up?
  12. Change old commit message using `git rebase`
  13. How to merge two branches without a common ancestor?
  14. git subtree: possible to change subtree branch/path in a forked repository?
  15. How do I push a new local branch to a remote Git repository and track it too?
  16. Git refusing to merge unrelated histories on rebase
  17. How to squash all git commits into one?
  18. How to move some files from one git repo to another (not a clone), preserving history
  19. Git – how to force merge conflict and manual merge on selected file
  20. Git: ignore some files during a merge (keep some files restricted to one branch)
  21. Git merge reports “Already up-to-date” though there is a difference
  22. Prevent commits in master branch
  23. How does ‘git merge’ work in details?
  24. How do I make a Git commit in the past?
  25. Repository size limits for GitHub.com
  26. What Git branching models work for you?
  27. How to fix commit order in GitHub pull requests, broken by git rebase?
  28. Git interactive rebase without opening the editor
  29. git push to remote repository “Could not read from remote repository”
  30. When will `git pull –rebase` get me in to trouble?

Leave a Comment