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 vote314 views1 answer
Bash get file full path
Shell/Bash
0 vote326 views1 answer
How to install powerline for ubuntu
Shell/Bash
0 vote336 views1 answer
Debian install ab
Shell/Bash
0 vote310 views1 answer
Grep not multiple patterns
Shell/Bash
1 vote326 views2 answers
See changes git command line
Shell/Bash
1 vote314 views1 answer
Copy file to docker conatiner using docker dockerfile
Shell/Bash
0 vote321 views1 answer
Powershell bytes to mb
Shell/Bash
0 vote372 views1 answer
How to read from keyboard in bash and store in a variable
Shell/Bash
0 vote320 views1 answer
Find command absolute path
Shell/Bash
2 votes327 views2 answers
Sudo systemctl restart networking
Shell/Bash