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 vote137 views1 answer
Zsh: courpt historyfile
Shell/Bash
0 vote136 views1 answer
Git log to see changes only for a specific branch
Shell/Bash
0 vote138 views1 answer
Error mounting: mount: unknown filesystem type 'ntfs'
Shell/Bash
10 votes143 views4 answers
Ubuntu change username
Shell/Bash
20 votes128 views2 answers
Docker post installation steps linux
Shell/Bash
1 vote133 views1 answer
Listener kali linux
Shell/Bash
13 votes160 views1 answer
Install slack ubuntu/linux
Shell/Bash
2 votes161 views2 answers
Wget install windows cmd
Shell/Bash
0 vote142 views1 answer
Record bash_history immediately
Shell/Bash
0 vote132 views1 answer
Module not found: Can't resolve '@material-ui/pickers' in 'C:\Users\61455\Documents\React apps\mya2o\src
Shell/Bash