jgit.git - JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Implement recursive merge strategy	George C. Young	2013-02-22	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Extend ResolveMerger with RecursiveMerger to merge two tips that have up to 200 bases. Bug: 380314 CQ: 6854 Change-Id: I6292bb7bda55c0242a448a94956f2d6a94fddbaa Also-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <zx@twitter.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
*	Update README	Robin Stocker	2012-09-28	1	-32/+31
\| \| \| \| \| \|	Extend introduction, update links and remove outdated information. Change-Id: I29f4d72c980008b6bebe3b009d58c915cd091b9d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
*	README: Convert to Markdown and rename to README.md	Robin Stocker	2012-09-08	1	-0/+148
	This makes it display nicely on the GitHub mirror repository. And it is still very pleasant to read in plain text. Change-Id: I0c5e1caa58a22684cdbd9a02e9ec38e97d5adb1a Signed-off-by: Robin Stocker <robin@nibor.org>