Skip to content

Commit 269969e

Browse files
authored
Merge pull request #124 from waldyrious/patch-1
README: mention why drop and revert are included
2 parents 5951fad + 6137908 commit 269969e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

README.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ commands that are similar to the corresponding ``git`` commands:
111111

112112
(``git-imerge drop`` is also analogous to running ``git rebase
113113
--interactive``, then deleting the specified commit(s) from the
114-
history.)
114+
history. Both the ``drop`` and the ``revert`` subcommands are included
115+
in git-imerge because the equivalent git operations can conflict,
116+
so they both can benefit from using the incremental merge approach.)
115117

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

0 commit comments

Comments
 (0)