| commit | 7322ea2a51f42c4f41b116a85bb55f85ce49c824 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 28 Mar 2009 02:53:52 +0000 (27 19:53 -0700) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Sat, 28 Mar 2009 12:24:48 +0000 (28 13:24 +0100) | ||
| tree | 04c730762309eb8e72c879277634af8017d0c4cf | treesnapshot (tar.gz zip) |
| parent | f3308b8e94e1d78cec4c5037ae15d6ac145ff566 | commitdiff |
Add cherry picking and revert support to JGit
A cherry-pick can be performed by a 3 way merge, where the base is
the parent of the commit you are cherry-picking, instead of using
the derived base from the commit graph.
By allowing the caller of a ThreeWayMerger to set the merge base
prior to invoking the merge method, we allow the caller to direct
us to execute a cherry-pick, or a revert.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
A cherry-pick can be performed by a 3 way merge, where the base is
the parent of the commit you are cherry-picking, instead of using
the derived base from the commit graph.
By allowing the caller of a ThreeWayMerger to set the merge base
prior to invoking the merge method, we allow the caller to direct
us to execute a cherry-pick, or a revert.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>