Git rebase vs merge

Git rebase and merge both integrate changes from one branch into another. Where they differ is how it's done. Git rebase moves a feature branch into a master. Git merge adds a new commit, preserving the history

Git rebase vs merge

If you want to see the history completely same as it happened, you should use merge. Merge preserves history whereas rebase rewrites it.
Rebasing is better to streamline a complex history, you are able to change the commit history by interactive rebase. 
You can remove undesired commits, squash two or more commits into one or edit the commit message.
Rebase will present conflicts one commit at a time whereas merge will present them all at once.
It is better and much easier to handle the conflicts but you shouldn’t forget that
reverting a rebase is much more difficult than reverting a merge if there are many conflicts. 
You can find details of a basic rebase process from git — Basic Rebase .

Git pull vs rebase

git pull fetches the latest changes of the current branch from a remote and applies those changes to your local copy of the branch. 
Generally this is done by merging, i.e. the local changes are merged into the remote changes. So git pull is similar to git fetch & git merge.

git pull --rebase :
The local changes you made will be rebased on top of the remote changes, instead of being merged with the remote changes.

Similar codes

22 votes111 views6 answers
Git stash apply specific stash
Shell/Bash
0 vote99 views1 answer
Psycopg2 error pip install error
Shell/Bash
21 votes104 views2 answers
Login github command line
Shell/Bash
15 votes108 views3 answers
Ubuntu apache2 command
Shell/Bash
2 votes156 views3 answers
Clear command in linux
Shell/Bash
0 vote113 views1 answer
Update n98-magerun2
Shell/Bash
0 vote109 views1 answer
How to quit ssh in terminal
Shell/Bash
6 votes122 views2 answers
Mvn command not found ubuntu
Shell/Bash
12 votes111 views2 answers
Yarn add install all packages in package,json
Shell/Bash
0 vote108 views1 answer
Seatools for linux
Shell/Bash