Rebase and Merge

git-shit.md

Suppose there are 2 branches: master and feature

Squash Commits in Feature

• git checkout feature
• git rebase feature -i

This will open editor in interactive mode. DIfferent options like pick and squash are available

Rebase Feature into master without squash

First use rebase command standing in the feature branch.

• git checkout feature
• git rebase master

This will create a linear history, moving all the commits from Feature to current Head of master

Now go to master and merge:

• git checkout master
• git merge Feature

Rebase Feature into Master with Squash

• git checkout feature
• git rebase master -i
• git checkout master
• git merge feature

3-Way Merge

• git checkout master
• git merge feature This will create a non-linear history if master and feature have deviated with non-linearity.

Checkout File from Specific Commit

• git checkout --