WARNING: git filter-branch is no longer officially recommended If you are here to copy-paste code: This is an example which removes node_modules from history git filter-branch –tree-filter “rm -rf node_modules” –prune-empty HEAD git for-each-ref –format=”%(refname)” refs/original/ | xargs -n 1 git update-ref -d echo node_modules/ >> .gitignore git add .gitignore git commit -m ‘Removing node_modules … Read more
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
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
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
Update July 2012 (git 1.7.12+) You now can rebase all commits up to root, and select the second commit Y to be squashed with the first X. git rebase -i –root master pick sha1 X squash sha1 Y pick sha1 Z git rebase [-i] –root $tip This command can now be used to rewrite all … 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.
The way a cherry-pick works is by taking the diff a changeset represents (the difference between the working tree at that point and the working tree of its parent), and applying it to your current branch. So, if a commit has two or more parents, it also represents two or more diffs – which one … Read more
You can use –allow-unrelated-histories to force the merge to happen. The reason behind this is that default behavior has changed since Git 2.9: “git merge” used to allow merging two branches that have no common base by default, which led to a brand new history of an existing project created and then get pulled by … Read more
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