From 6a9a7d5625d19f679343c646170f448bc59d67c5 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Thu, 24 Sep 2020 19:58:40 +0200
Subject: [PATCH] Avoid git pull warning

---
 labs/grading-and-submission.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/labs/grading-and-submission.md b/labs/grading-and-submission.md
index add2dee..577b42e 100644
--- a/labs/grading-and-submission.md
+++ b/labs/grading-and-submission.md
@@ -61,7 +61,7 @@ git commit -am "My message"
 You can then synchronize your local git repository with the gitlab server by
 first running:
 ```shell
- git pull
+ git pull --no-rebase
 ```
 
 This will merge in your local repository any change we made to the lab
-- 
GitLab