From c60cbbccfcfb5833ae303acac60267eea837686d Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Tue, 19 Nov 2024 10:22:34 -0800 Subject: [PATCH 1/2] Make `unsafe.force-push` visible --- unison-cli/src/Unison/CommandLine/InputPatterns.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unison-cli/src/Unison/CommandLine/InputPatterns.hs b/unison-cli/src/Unison/CommandLine/InputPatterns.hs index 40623a8c63..179c1d1567 100644 --- a/unison-cli/src/Unison/CommandLine/InputPatterns.hs +++ b/unison-cli/src/Unison/CommandLine/InputPatterns.hs @@ -2021,10 +2021,10 @@ pushForce :: InputPattern pushForce = InputPattern "unsafe.force-push" - [] - I.Hidden + ["push.unsafe-force"] + I.Visible [("remote destination", Optional, remoteNamespaceArg), ("local source", Optional, namespaceOrProjectBranchArg suggestionsConfig)] - (P.wrap "Like `push`, but overwrites any remote namespace.") + (P.wrap "Like `push`, but forcibly overwrites the remote namespace.") $ fmap ( \sourceTarget -> Input.PushRemoteBranchI From 547fdbf45eaad210766435ae5185c0226fa338e8 Mon Sep 17 00:00:00 2001 From: aryairani Date: Mon, 25 Nov 2024 15:23:42 +0000 Subject: [PATCH 2/2] rerun transcripts (reminder to rerun CI!) --- unison-src/transcripts/help.output.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unison-src/transcripts/help.output.md b/unison-src/transcripts/help.output.md index 510fe617cc..1b176f97b3 100644 --- a/unison-src/transcripts/help.output.md +++ b/unison-src/transcripts/help.output.md @@ -810,6 +810,9 @@ scratch/main> help undo `undo` reverts the most recent change to the codebase. + unsafe.force-push (or push.unsafe-force) + Like `push`, but forcibly overwrites the remote namespace. + update Adds everything in the most recently typechecked file to the namespace, replacing existing definitions having the same