Difference between git pull --rebase and git pull --ff-only

git git-rebase git-pull
Nico picture Nico · Aug 21, 2014 · Viewed 57k times · Source

Let's say origin/master has commit A--B--C and my local/master has commit A--B--D.

What will happen if I use git pull --rebase ?

What will happen if I use git pull --ff-only ?

Is there any difference in the resulting commit tree ?

Answer

Gabriele Petronella picture Gabriele Petronella · Aug 21, 2014

What will happen if I use git pull --rebase ?

git pull --rebase is roughly equivalent to

git fetch
git rebase origin/master

i.e. your remote changes (C) will be applied before the local changes (D), resulting in the following tree

A -- B -- C -- D

What will happen if I use git pull --ff-only ?

It will fail.

git pull --ff-only corresponds to

git fetch
git merge --ff-only origin/master

--ff-only applies the remote changes only if they can be fast-forwarded. From the man:

Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward

Since your local and remote branches have diverged, they cannot be resolved by a fast-forward and git pull --ff-only would fail.

Related questions

What is the difference between git pull and git fetch + git rebase?

Another question says that git pull is like a git fetch + git merge. But what is the difference between git pull and git fetch + git rebase?

Read More
git rebase upstream/master vs git pull --rebase upstream master

Is there a difference between git rebase upstream/master and git pull --rebase upstream master, and if so, what? The remote could be any remote, not necessarily upstream.

Read More
Undoing a git pull --rebase

Hey I'm new to git and I need to undo a pull, can anyone help?!? So what I've done is... git commit git stash git pull --rebase git stash pop this created a bunch of conflicts and went a bit …

Read More