Skip to content

Commit 49ac1c2

Browse files
committed
README: add prose explanations of the commands in the table
1 parent 54789cc commit 49ac1c2

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

README.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,23 +83,31 @@ To start a merge or rebase operation using ``git-imerge``, you use
8383
commands that are similar to the corresponding ``git`` commands:
8484

8585
.. list-table:: Starting an incremental merge or rebase
86-
:widths: 50 50
8786
:header-rows: 1
8887

8988
* - ``git-imerge`` command
9089
- ``git`` analogue
90+
- Effect
9191
* - ``git-imerge merge BRANCH``
9292
- ``git merge BRANCH``
93+
- Merge ``BRANCH`` into the current branch.
9394
* - ``git-imerge rebase BRANCH``
9495
- ``git rebase BRANCH``
96+
- Rebase the current branch on top of ``BRANCH``
9597
* - ``git-imerge revert COMMIT``
9698
- ``git revert COMMIT``
99+
- Add a new commit that undoes the effect of ``COMMIT``
97100
* - ``git-imerge revert COMMIT1..COMMIT2``
98101
- ``git revert COMMIT1..COMMIT2``
102+
- Add new commits that undo the effects of ``COMMIT1..COMMIT2``
99103
* - ``git-imerge drop COMMIT``
100104
- ``git rebase --onto COMMIT^ COMMIT``
105+
- Entirely delete commit ``COMMIT`` from the history of the
106+
current branch
101107
* - ``git-imerge drop COMMIT1..COMMIT2``
102108
- ``git rebase --onto COMMIT1 COMMIT2``
109+
- Entirely delete commits ``COMMIT1..COMMIT2`` from the history
110+
of the current branch
103111

104112
(``git-imerge drop`` is also analogous to running ``git rebase
105113
--interactive``, then deleting the specified commit(s) from the

0 commit comments

Comments
 (0)