qf: Make pull a fast forward only.

Be more strict here in order to make it more failsafe on
auto rebases.

v2: Add message requested by Lucas, mentioning that
    qf pull fails if branch cannot be fast forwarded.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

2 files changed, 6 insertions, 11 deletions

diff --git a/qf b/qf
index 92fad9dc26ea..4989f3691e04 100755
--- a/qf
+++ b/qf
@@ -413,12 +413,7 @@ function qf_pull
 
 	qf fetch
 	cd patches
-
-	if [[ $1 == "--rebase" ]] ; then
-		git rebase "@{upstream}"
-	else
-		git merge "@{upstream}"
-	fi
+	git pull --ff-only
 
 	qf co
 }
diff --git a/qf.rst b/qf.rst
index 66272703bc12..9dac6b9e1eaa 100644
--- a/qf.rst
+++ b/qf.rst
@@ -186,12 +186,12 @@ fetch
 Fetches both the main and patches barnch remotes and pulls all
 the baseline refs into the main repo.
 
-pull [--rebase]
----------------
+pull
+----
 
-First runs qf fetch and then updates the patches branch (with a git merge) and
-the checks out the latest working copy. When given --rebase will rebase the
-patches branch instead of merging.
+First runs qf fetch, then updates the patches branch, and
+then checks out the latest working copy.
+If fails if the patches branch can't be fast forwarded.
 
 stage
 -----