Merge pull request #100 from mhagger/drop-and-revert

Add two new subcommands: `git imerge drop` and `git imerge revert`

Author: mhagger

README.rst

@@ -83,20 +83,40 @@ To start a merge or rebase operation using ``git-imerge``, you use
 commands that are similar to the corresponding ``git`` commands:
 
 .. list-table:: Starting an incremental merge or rebase
-   :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``
-
-For more flexibility, you can start an incremental merge using ``git
-imerge start``::
-
-    git-imerge start --name=NAME --goal=GOAL --first-parent BRANCH
+   * - ``git-imerge`` command
+     - ``git`` analogue
+     - Effect
+   * - ``git-imerge merge BRANCH``
+     - ``git merge BRANCH``
+     - Merge ``BRANCH`` into the current branch.
+   * - ``git-imerge rebase BRANCH``
+     - ``git rebase BRANCH``
+     - Rebase the current branch on top of ``BRANCH``
+   * - ``git-imerge revert COMMIT``
+     - ``git revert COMMIT``
+     - Add a new commit that undoes the effect of ``COMMIT``
+   * - ``git-imerge revert COMMIT1..COMMIT2``
+     - ``git revert COMMIT1..COMMIT2``
+     - Add new commits that undo the effects of ``COMMIT1..COMMIT2``
+   * - ``git-imerge drop COMMIT``
+     - ``git rebase --onto COMMIT^ COMMIT``
+     - Entirely delete commit ``COMMIT`` from the history of the
+       current branch
+   * - ``git-imerge drop COMMIT1..COMMIT2``
+     - ``git rebase --onto COMMIT1 COMMIT2``
+     - Entirely delete commits ``COMMIT1..COMMIT2`` from the history
+       of the current branch
+
+(``git-imerge drop`` is also analogous to running ``git rebase
+--interactive``, then deleting the specified commit(s) from the
+history.)
+
+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
 
 where
 

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.