Page MenuHomePhabricator
Files F13115222

D14310.id.diff
No OneTemporary
Actions

D14310.id.diff
View Options

diff --git a/contrib/extract-electrum.sh b/contrib/extract-electrum.sh
--- a/contrib/extract-electrum.sh
+++ b/contrib/extract-electrum.sh
@@ -18,6 +18,6 @@
pushd electrumabc-mirror
git filter-repo --path electrum --path-rename electrum/:
git remote add github https://github.com/Bitcoin-ABC/ElectrumABC.git
-git pull github master --rebase --strategy-option=theirs
+git pull github master --rebase
git gc --prune=now
popd

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 10:20 (11 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187334
Default Alt Text
D14310.id.diff (429 B)

Event Timeline