From e8cbb858258faf20dbc0884b8ee31b62e0200ebf Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Fri, 25 Dec 2020 09:20:35 +1100 Subject: [PATCH] docs: fix simple typo, octipus -> octopus There is a small typo in TODO.md. Should read `octopus` rather than `octipus`. --- TODO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TODO.md b/TODO.md index 5e3f332..8b13cf7 100644 --- a/TODO.md +++ b/TODO.md @@ -13,7 +13,7 @@ ## Convenience features -* Add a two-argument form of the `start` and `init` commands to specify both branches in one go. (Or maybe not, if we want to leave the way open to supporting octipus merges!) Maybe `--onto=X` like rebase? +* Add a two-argument form of the `start` and `init` commands to specify both branches in one go. (Or maybe not, if we want to leave the way open to supporting octopus merges!) Maybe `--onto=X` like rebase? * Improve the handling of log messages. Incorporate log messages from manual merge conflicts into suggested log messages for the simplified commits.