From 6da0ed464cbe2c6bfb0fd20ddb485f3c2ec6998d Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Sun, 7 Aug 2022 19:41:29 +0200 Subject: Fix buggy margin notes --- site/opinions/MonadTransformers.org | 12 ++++++------ site/opinions/StackedGit.org | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'site/opinions') diff --git a/site/opinions/MonadTransformers.org b/site/opinions/MonadTransformers.org index 08f8e1b..22f4edd 100644 --- a/site/opinions/MonadTransformers.org +++ b/site/opinions/MonadTransformers.org @@ -3,12 +3,12 @@ #+SERIES: index.html #+SERIES_NEXT: StackedGit.html -[[mn:1][Time has passed since the publication of this article. Whether -or not I remain in sync with its conclusions is an open -question. Monad Transformers are a great abstraction, but given the -choice, I would probably choose another approach, namely extensible -effects.]] This article has originally been published on @@html:@@July 15, 2017@@html:@@. +This article has originally been published on @@html:@@July 15, 2017@@html:@@. [[mn:doubts][Time has +passed since the publication of this article. Whether or not I remain +in sync with its conclusions is an open question. Monad Transformers +are a great abstraction, but given the choice, I would probably choose +another approach.]] #+BEGIN_EXPORT html
site/opinions/MonadTransformers.org
diff --git a/site/opinions/StackedGit.org b/site/opinions/StackedGit.org index 95ad6f7..27d392b 100644 --- a/site/opinions/StackedGit.org +++ b/site/opinions/StackedGit.org @@ -28,8 +28,8 @@ become a cornerstone of my development workflow. There is a few things to unpack here. First and as its name suggests, Stacked Git is a tool built on top of Git. - [[mn:1][My main takeaway from my Pijul adventure is connected to this. - Git is not limited to the ~git~ binary. + [[mn:pijul][My main takeaway from my Pijul adventure is connected to + this. Git is not limited to the ~git~ binary. Git comes with a collection of powerful forges, nice editor plugins, and years of good practices. To this day, it’s neither the bugs nor the breaking changes that @@ -115,7 +115,7 @@ become a cornerstone of my development workflow. the wrong patch). But when used carefully, it can be very handy. - [[mn:3][Stacked Git is supposedly able to detect, during a rebase, + [[mn:rebase][Stacked Git is supposedly able to detect, during a rebase, which of your patches have been applied to your target branch. I’d rather use ~stg uncommit~ before do the rebase, though.]] Finally, ~stg rebase REF~ moves your stack of patches on top of @@ -309,7 +309,7 @@ become a cornerstone of my development workflow. that you can pass to ~git cherry-pick~ and ~git rebase~. Not really. - [[mn:2][I don’t want to be unfair to Stacked Git here. Maybe the + [[mn:doubts][I don’t want to be unfair to Stacked Git here. Maybe the documentation of Stacked Git provides useful tips to deal with this issue, and I have just overlooked it.]] Stacked Git has a command called ~stg undo~, which can achieve this -- cgit v1.2.3