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 vote156 views1 answer
Create service for gunicorn in linux
Shell/Bash
64 votes161 views2 answers
Git change commit message of old commit
Shell/Bash
9 votes155 views6 answers
Cpu usage linux
Shell/Bash
0 vote151 views1 answer
Uninstall peazip linux
Shell/Bash
32 votes153 views6 answers
Sed replace with variable
Shell/Bash
0 vote229 views1 answer
Git amend with previous commit
Shell/Bash
18 votes155 views2 answers
Add user to group arch
Shell/Bash
4 votes151 views1 answer
Terminal shortcut ubuntu
Shell/Bash
8 votes172 views2 answers
Ubuntu open task manager
Shell/Bash
0 vote141 views1 answer
Azure cli stop aks cluster
Shell/Bash