diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-10-24 00:48:31 +0200 |
|---|---|---|
| committer | Chris Aniszczyk <zx@twitter.com> | 2012-12-28 16:44:46 -0600 |
| commit | 315f1cfa5c63f4d3355704c80d00ac1323a36171 (patch) | |
| tree | 97243a3d4d5b9b3c4d3fb2e216716d69cfb03975 /org.eclipse.jgit.packaging/org.eclipse.jgit.feature | |
| parent | 75eb6a147ffa8089e48d409f0215a16c755305e7 (diff) | |
| download | jgit-315f1cfa5c63f4d3355704c80d00ac1323a36171.tar.gz jgit-315f1cfa5c63f4d3355704c80d00ac1323a36171.zip | |
Update the revert command and things relating to revert
Cherry-pick has been fixed, but even though revert does
basically the same thing, the fixes were not carried over here.
- Recognize the revert-states, analogous to the cherry picking states
- Make reset handle a revert-in-progress
- Update REVERT_HEAD and MERGE_MSG when revert fails due to conflicts
- Clear revert state on commit and reset
- Format the message similarily to how cherry-pick does. This is
not exactly how C Git does it.
The interface is still not the same as for cherry-picking.
Change-Id: I8ea956fcbc9526d62a2365360feea23a9280eba3
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.feature')
0 files changed, 0 insertions, 0 deletions