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

0 vote111 views1 answer
Resolvconf set dns
Shell/Bash
4 votes111 views5 answers
Psycopg2 error install
Shell/Bash
1 vote110 views1 answer
Restart nautilus from terminal
Shell/Bash
0 vote146 views1 answer
Install solidity compiler command with version
Shell/Bash
35 votes135 views6 answers
Ubuntu update nodejs
Shell/Bash
0 vote109 views1 answer
Mac see what is ruuning on a port
Shell/Bash
0 vote116 views1 answer
Git clone latest release
Shell/Bash
1 vote113 views2 answers
Install wordpress linux
Shell/Bash
0 vote117 views1 answer
Mdem ubuntu add user to sudo
Shell/Bash
0 vote112 views1 answer
Get linux distro from terminal
Shell/Bash