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 vote313 views1 answer
How to install gitkraken on fedora
Shell/Bash
13 votes332 views1 answer
Git list user and email
Shell/Bash
0 vote325 views1 answer
Install workbench on ubuntu
Shell/Bash
0 vote331 views1 answer
Git pull in forked repo
Shell/Bash
19 votes347 views2 answers
How to change timezone in linux
Shell/Bash
0 vote329 views1 answer
Ssh current directory
Shell/Bash
0 vote394 views1 answer
Vim insert result of shell command
Shell/Bash
1 vote316 views5 answers
Install adb
Shell/Bash
1 vote357 views1 answer
Journalctl tial
Shell/Bash
1 vote342 views2 answers
Copy secret from one namespace to another
Shell/Bash