Merge pull request eth-educators#916 from yorickdowne/main

Silence rebase nags
LeKo888 · Aug 22, 2022 · 9c8b43e · 9c8b43e
2 parents 9bdad2f + 0f02e05
commit 9c8b43e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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