mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-10-26 15:38:41 +03:00
Update documentation
This commit is contained in:
parent
6d3c548c6c
commit
da7e41ee69
20
README.rst
20
README.rst
@ -86,15 +86,19 @@ commands that are similar to the corresponding ``git`` commands:
|
||||
:widths: 50 50
|
||||
:header-rows: 1
|
||||
|
||||
* - ``git`` command
|
||||
- ``git-imerge`` equivalent
|
||||
* - ``git merge BRANCH``
|
||||
- ``git-imerge merge BRANCH``
|
||||
* - ``git rebase BRANCH``
|
||||
- ``git-imerge rebase BRANCH``
|
||||
* - ``git-imerge`` command
|
||||
- ``git`` analogue
|
||||
* - ``git-imerge merge BRANCH``
|
||||
- ``git merge BRANCH``
|
||||
* - ``git-imerge rebase BRANCH``
|
||||
- ``git rebase BRANCH``
|
||||
* - ``git-imerge drop COMMIT``
|
||||
- ``git rebase --interactive``
|
||||
* - ``git-imerge revert COMMIT``
|
||||
- ``git revert COMMIT``
|
||||
|
||||
For more flexibility, you can start an incremental merge using ``git
|
||||
imerge start``::
|
||||
A few more options are available if you start the incremental merge
|
||||
using ``git imerge start``::
|
||||
|
||||
git-imerge start --name=NAME --goal=GOAL [--first-parent] BRANCH
|
||||
|
||||
|
6
TODO.rst
6
TODO.rst
@ -30,18 +30,12 @@ Convenience features
|
||||
manual merge conflicts into suggested log messages for the
|
||||
simplified commits.
|
||||
|
||||
* Maybe remember the names of the two original branches for use in log
|
||||
messages etc. (Should they be stored locally in ``git config`` or
|
||||
shareably in the state blob?)
|
||||
|
||||
* Allow the user to specify which conflict he would like to resolve
|
||||
next, and set it up for him.
|
||||
|
||||
* Allow the user to block certain merges, meaning that they should
|
||||
never be skipped over or merged automatically.
|
||||
|
||||
* Think about where to leave HEAD in the various scenarios.
|
||||
|
||||
* Add a ``git imerge pause`` that puts an imerge on hold and resets
|
||||
the working copy to a reasonable state.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user