From 75463197231e860b4246f2e16e00f76f6e38707c Mon Sep 17 00:00:00 2001
From: Anthony O'Brien <anthony@bearonis.com>
Date: Mon, 30 Mar 2020 20:19:47 -0400
Subject: [PATCH] ff-only not possible

---
 README.forwarder.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.forwarder.md b/README.forwarder.md
index 686e5af9a0d2d..24ff0f38a0643 100644
--- 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: