ff-only not possible

Giphy · Mar 31, 2020 · 7546319 · 7546319
1 parent b3f972b
commit 7546319
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.forwarder.md b/README.forwarder.md
@@ -29,7 +29,7 @@ This repo just follows the upstream DataDog/datadog-agent repo with some added
 files to ease building a standalone forwarder, the code can be updated with git:
 
     $ git fetch upstream master
-    $ git merge --ff-only upstream/master
+    $ git merge upstream/master
     $ git push origin
 
 The `upstream` is configured with git: