commit 9f98a087ba9d9c708c27ec395bd63a193bc5e7b2
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Fri Feb 24 17:36:19 2023 UTC

fix bad wording used in previous commit

commit - e2a70d14e88c86a2cb8f85f94a7bcaaf0ec72409
commit + 9f98a087ba9d9c708c27ec395bd63a193bc5e7b2
blob - 12360d5798d23b8b218ea4ca0d991b798967f605
blob + e098c6c2b1b4710c0cd2da77b5fb96d09897c156
--- TODO
+++ TODO
@@ -12,7 +12,7 @@ got:
   creating a merge commit. Fast-forward should only be done if linear
   history exists from the tip of the branch being merged to the tip of
   the work tree's branch, and if the tip of the work tree's branch is
-  itself not a merge commit (this makes "staggered" merges possible
+  itself not a merge commit (this makes "stacked" merges possible
   by default, and prevents a 'main' branch from being fast-forwarded
   to a vendor branch in case no new commits were added to 'main' since
   the previous vendor merge). Provide an option (-M) which forces creation