Skip to content

Commit 54789cc

Browse files
committed
README: show examples of revert and drop with a commit range
Also, explain `git imerge drop` in terms of the analogous `git rebase --onto` commands. Mention the connection to `git rebase --interactive` in the text following the table.
1 parent da7e41e commit 54789cc

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

README.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,18 @@ commands that are similar to the corresponding ``git`` commands:
9292
- ``git merge BRANCH``
9393
* - ``git-imerge rebase BRANCH``
9494
- ``git rebase BRANCH``
95-
* - ``git-imerge drop COMMIT``
96-
- ``git rebase --interactive``
9795
* - ``git-imerge revert COMMIT``
9896
- ``git revert COMMIT``
97+
* - ``git-imerge revert COMMIT1..COMMIT2``
98+
- ``git revert COMMIT1..COMMIT2``
99+
* - ``git-imerge drop COMMIT``
100+
- ``git rebase --onto COMMIT^ COMMIT``
101+
* - ``git-imerge drop COMMIT1..COMMIT2``
102+
- ``git rebase --onto COMMIT1 COMMIT2``
103+
104+
(``git-imerge drop`` is also analogous to running ``git rebase
105+
--interactive``, then deleting the specified commit(s) from the
106+
history.)
99107

100108
A few more options are available if you start the incremental merge
101109
using ``git imerge start``::

0 commit comments

Comments
 (0)