Shawn Pearce 4bd28bc958 RecursiveMerger: do not insert virtual commits into repository ... When merging common ancestors to create a single virtual common ancestor the commit does not need to be inserted into the Git repository. Instead just mock it out in memory as part of the merger's RevWalk pool. Make the author and committer stable and predictable for any given pair of merge bases. It is not necessary for the caller's name or email to be used as the commit will not be written out. Change-Id: I88d5ee4de121950e1b032a5c10486c9d2c42656c		2014-08-08 11:31:24 -07:00
..
.settings	Fix API errors raised on ResolveMerger affecting API providers only	2014-07-31 00:02:17 +02:00
META-INF	Mark package org.eclipse.jgit.gitrepo.internal as x-internal	2014-07-30 23:54:24 +02:00
findBugs	[findBugs] Silence warning about Transport initialization	2012-09-14 00:01:47 +02:00
resources/org/eclipse/jgit	Fixed message for exception thrown during recursive merge	2014-07-28 14:43:22 +02:00
src/org/eclipse/jgit	RecursiveMerger: do not insert virtual commits into repository	2014-08-08 11:31:24 -07:00
.classpath	Externalize strings from JGit	2010-05-19 14:37:16 -07:00
.fbprefs	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07:00
.gitignore	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Revert "Hide Maven target directories from Eclipse"	2010-08-28 09:50:50 +02:00
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Add "resources/" as a source folder	2010-06-05 14:39:27 +02:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Prepare 3.4.2-SNAPSHOT builds	2014-06-21 00:57:43 +02:00