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

1 vote247 views1 answer
Docker-compose container list
Shell/Bash
0 vote267 views1 answer
Git link branch to remote
Shell/Bash
0 vote278 views1 answer
Edit maven config settings.xml
Shell/Bash
22 votes273 views6 answers
Tar extract
Shell/Bash
0 vote283 views1 answer
Linux maker user sudo
Shell/Bash
0 vote273 views1 answer
Remove All Local Branches not on Remote
Shell/Bash
-2 votes270 views1 answer
How to open application from terminal in ubuntu
Shell/Bash
0 vote229 views2 answers
Brew install spectacle
Shell/Bash
0 vote263 views1 answer
C# check if word is installed
Shell/Bash
0 vote286 views1 answer
Repro blender ubuntu 18.04
Shell/Bash