Konrad Kügler b84057ad62 Cherry-Pick: Support --mainline to pick merges ... By specifying a mainline parent, a merge is cherry picked as if this parent was its only parent. If no mainline parent is given, cherry picking merges is not allowed, as before. Change-Id: I391cb73bf8f49e2df61428c17b40fae8c86a8b76 Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>		2014-05-17 19:18:07 +02:00
..
.settings	Disable warning about assigning to parameter	2013-06-15 15:11:54 +02:00
META-INF	Prepare 3.4.0-SNAPSHOT builds	2014-05-06 00:04:09 +02:00
exttst/org/eclipse/jgit/patch	Kill GitIndex	2011-11-09 09:16:50 +01:00
tst/org/eclipse/jgit	Cherry-Pick: Support --mainline to pick merges	2014-05-17 19:18:07 +02:00
tst-rsrc	Fix patch application WRT windows line endings.	2013-01-19 13:29:02 +01:00
.classpath	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
.gitignore	Extend the FS class for Java7	2013-05-04 02:01:56 +02:00
.project	Extend the FS class for Java7	2013-05-04 02:01:56 +02:00
build.properties	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	2010-01-10 15:59:03 +01:00
org.eclipse.jgit.core--All-External-Tests (Java 6).launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-External-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.core--All-Tests (Java 6).launch	Increase heap size for jgit tests	2010-08-27 00:29:31 +02:00
org.eclipse.jgit.core--All-Tests (Java 7).launch	Extend the FS class for Java7	2013-05-04 02:01:56 +02:00
org.eclipse.jgit.core--All-Tests (Java 8).launch	Add launchers for running tests with Java 8	2014-03-29 20:07:10 +01:00
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	Prepare 3.4.0-SNAPSHOT builds	2014-05-06 00:04:09 +02:00