From 214b0ac8e3383a0ef97e7df43d25b8e2700e79cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20M=C3=A4der?= <maeder@phys.ethz.ch> Date: Fri, 15 Jun 2018 12:50:54 +0200 Subject: [PATCH] Fix pull --rebase --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b9e2073..9fb2d0f 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ If you want to continue working in your branch, do: ``` git checkout newfeature -git pull --rebase origin/master +git pull --rebase origin master ``` This will do a fast-forward merge. -- GitLab