Commit Diff

Commit:
80be18be44c18ed586311d60524d01633b94cf6f
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
fix bad wording used in previous commit
Actions:
Patch | Tree
commit - 1756e377b0f3d32399f9bb06d235b261190cbf2f
commit + 80be18be44c18ed586311d60524d01633b94cf6f
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