]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 910a69d) | patch
Check for FF_ONLY merges correctly 52/9852/2
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Tue, 22 Jan 2013 23:04:08 +0000 (00:04 +0100)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Mon, 28 Jan 2013 23:48:56 +0000 (00:48 +0100)
commit642ff2cd7dd6ae361e4993255ade89a32e20601f
tree29886b57dc3ddb3a5651c83200cdab49f00cfae2tree | snapshot
parent910a69d4c8a892a71f4ac1f8c54f7d91887001d5commit | diff
Check for FF_ONLY merges correctly

Bug: 398192
Change-Id: I1253c0ea0632185bbf9f77e32f13ba5842a6e18e
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit