mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-08-16 18:40:24 +03:00
docs: fix simple typo, octipus -> octopus
There is a small typo in TODO.md. Should read `octopus` rather than `octipus`.
This commit is contained in:
parent
d1e8f36caf
commit
e8cbb85825
2
TODO.md
2
TODO.md
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
## Convenience features
|
## 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.
|
* Improve the handling of log messages. Incorporate log messages from manual merge conflicts into suggested log messages for the simplified commits.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user