Merge remote-tracking branch 'origin/main' into update-from-upstream

kristof-mattei · Jul 7, 2022 · 8d51101 · 8d51101
2 parents 24196b6 + da31a93
commit 8d51101
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/update-from-upstream.sh b/update-from-upstream.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+git fetch upstream
+
+git checkout -b update-from-upstream
+git checkout update-from-upstream
+
+git merge upstream/main