From 0f02e056361e4311efb79fe68bfeb07204390098 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <yorickdowne@gmail.com>
Date: Mon, 22 Aug 2022 22:36:22 +0000
Subject: [PATCH] Silence rebase nags

---
 ethd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ethd b/ethd
index 7fecfddf..21cecfc0 100755
--- a/ethd
+++ b/ethd
@@ -189,6 +189,7 @@ update() {
         fi
         # Do not track changes to ext-network.yml
         ${__as_owner} git update-index --assume-unchanged ext-network.yml
+        ${__as_owner} git config pull.rebase false
         ${__as_owner} git pull
         # BASH_SOURCE so newer code gets to do the update. Use an ENV var
         # to avoid infinite loop