What is the difference between git pull and git pull --no-rebase
?
In my understanding the git pull by default does a fetch then a merge. So the no-rebase means merge and therefore these two commands are exactly identical! Is that correct?
When you have pull.rebase set to true in your config, the default action upon git pull is a rebase.
In this case, the --no-rebase option is a one-time exception to your personal default, resulting in a merge-pull.