mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-07-14 18:30:27 +03:00
Code Issues Projects Releases Wiki Activity

docs: fix simple typo, octipus -> octopus

Browse Source 
There is a small typo in TODO.md.

Should read `octopus` rather than `octipus`.
This commit is contained in:
Tim Gates 2020-12-25 09:20:35 +11:00
parent d1e8f36caf
commit e8cbb85825
No known key found for this signature in database
GPG Key ID: AE3BE0D53823CF05
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.md
View File

@ -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.