Suppose originally there were 3 commits, A,B,C: Then developer Dan created commit D, and developer Ed created commit E: Obviously, this conflict should be resolved somehow. For this, there are 2 ways: MERGE: Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E. … Read more
There are 2 steps to achieving this: Create a new empty commit Rewrite history to start from this empty commit We’ll put the new empty commit on a temporary branch newroot for convenience. 1. Create a new empty commit There is a number of ways you can do this. Using just plumbing The cleanest approach … Read more
As mentioned by ecdpalma below, git 1.7.12+ (August 2012) has enhanced the option –root for git rebase: “git rebase [-i] –root $tip” can now be used to rewrite all the history leading to “$tip” down to the root commit. That new behavior was initially discussed here: I personally think “git rebase -i –root” should be … Read more
As of git 1.6.2, you can use git rebase –root -i. For each commit except the first, change pick to squash.
Merge commits: retains all of the commits in your branch and interleaves them with commits on the base branch Merge Squash: retains the changes but omits the individual commits from history Rebase: This moves the entire feature branch to begin on the tip of the master branch, effectively incorporating all of the new commits in … Read more
Git refusing to merge unrelated histories on rebase
The easiest way would be to find the head commit of the branch as it was immediately before the rebase started in the reflog… git reflog and to reset the current branch to it (with the usual caveats about being absolutely sure before reseting with the –hard option). Suppose the old commit was HEAD@{2} in … Read more
Squash my last X commits together using Git