git-branch-sculpting

Suppose I have the following history: A---B---C----------D------------E master \ /\ / W1--X1--Y1 W2--X2--Y2 topic1 topic2 Is it possible to remove all topic branches and their commits as following A-B-C-D-E master You have a few options for doing this. Solution 1: Squash Merges One solution is to simply use a hard reset with a few squash merges: git checkout master git reset --hard C git merge --squash topic1 git commit -m "Rewrite D" git merge --squash topic2 git commit -m "Rewrite E" # Verify that the new branch is no different from the old one git diff sha_of_old_E The idea here is that a

I have two git repositories R1 and R2 , which contain commits from two periods of a product's development: 1995-1997 and 1999-2013. (I created them by converting existing RCS and CVS repositories into Git.) R1: A---B---C---D R2: K---L---M---N How can I combine the two repositories into a single one that contains an accurate view of the project's linear history? A---B---C---D---K---L---M---N Note that between R1 and R2 files have been added, deleted, and renamed. I tried creating an empty repository and then merging their contents onto it. git remote add R1 /vol/R1.git git fetch R1 git remote