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
Shell find string in directory
Shell/Bash
0 vote241 views6 answers
Ubuntu enable network manager
Shell/Bash
0 vote233 views1 answer
Lavastore js
Shell/Bash
0 vote245 views1 answer
Install Deno - Scoop (Windows)
Shell/Bash
1 vote295 views1 answer
Create new docker image from existing
Shell/Bash
0 vote233 views1 answer
Bat to delete all ".trashed" files in subfolders
Shell/Bash
2 votes254 views1 answer
What brach am i in git
Shell/Bash
0 vote204 views1 answer
Vim-gnome has no installation candidate
Shell/Bash
0 vote248 views1 answer
How to reslove Jira Software is licensed but not currently installed
Shell/Bash
37 votes268 views6 answers
Debian install node js
Shell/Bash