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

	Commit message (Expand)	Author	Age	Files	Lines
*	Rename RecursiveMergerTest and ResolveMergerTest to reduce confusion	David Pursehouse	2018-03-24	1	-1333/+0
*	ResolveMergerTest: Use @DataPoints instead of @DataPoint	David Pursehouse	2018-03-24	1	-6/+4
*	Open auto-closeable resources in try-with-resource	David Pursehouse	2018-03-13	1	-12/+14
*	Consistently use Constants.CHARSET rather than StandardCharsets.UTF_8	David Pursehouse	2018-03-11	1	-7/+7
*	Basic submodule merge handling	David Turner	2018-02-04	1	-0/+151
*	Fix index blob for merges with CRLF translations	Thomas Wolf	2018-02-02	1	-0/+3
*	Honor CRLF settings when writing merge results	Thomas Wolf	2018-02-02	1	-0/+29
*	Use constants from StandardCharsets instead of hard-coded strings	David Pursehouse	2017-12-07	1	-4/+3
*	Avoid loading and merging binary data in ResolveMerger	Han-Wen Nienhuys	2017-10-24	1	-0/+142
*	Support creating Mergers without a Repository	Dave Borowitz	2017-04-05	1	-1/+132
*	ResolveMergerTest: Add tests for content merges	Dave Borowitz	2017-04-04	1	-0/+58
*	Use FS#lastModified instead of File#lastModified	Masaya Suzuki	2016-08-24	1	-12/+14
*	ResolveMergerTest: Open Git in try-with-resource	David Pursehouse	2016-02-05	1	-29/+30
*	Repository: Introduce exactRef and findRef, deprecate getRef	Jonathan Nieder	2015-11-25	1	-1/+1
*	Fix ResolveMerger when files should be replaced by folders	Christian Halstrick	2015-07-23	1	-0/+74
*	Do not add a newline at the end if neither merged side had one	André de Oliveira	2015-03-27	1	-3/+3
*	Fix merge/cherry-picking in CRLF mode	Robin Rosenberg	2014-03-02	1	-0/+32
*	Failing to delete a directory with untracked content is actually ok	Robin Rosenberg	2014-02-10	1	-5/+4
*	A folder does not constitute a dirty work tree	Robin Rosenberg	2013-03-10	1	-0/+77
*	Implement recursive merge strategy	George C. Young	2013-02-22	1	-0/+66
*	Move base test classes to the junit bundle for reuse for Java 7 tests	Robin Rosenberg	2013-02-04	1	-1/+1
*	Refactor ResolveMergerTest to allow testing multiple strategies	Christian Halstrick	2012-10-25	1	-35/+67
*	Add the intended file to avoid breakage	Robin Rosenberg	2012-09-25	1	-1/+1
*	cleanup: Prefer assertEquals over assertTrue(....equals(...))	Robin Rosenberg	2012-09-03	1	-5/+5
*	Again teach ResolveMerger to create more correct DirCacheEntry's	Christian Halstrick	2012-07-26	1	-0/+439
*	Revert "Teach ResolveMerger to create more correct DirCacheEntry's"	Shawn Pearce	2012-07-24	1	-177/+1
*	Teach ResolveMerger to create more correct DirCacheEntry's	Markus Duft	2012-07-19	1	-1/+177
*	Don't return success on failing paths in ResolveMerger	Robin Stocker	2012-06-23	1	-0/+98