Konrad Kügler 48e36d8cb3 Use branch.<x>.mergeoptions and merge.ff as defaults for merging ... Read options that control squashing, whether or not to commit the merge and regarding fast forwarding from the configuration and use them if no explicit values for these options have been provided to MergeCommand. Change-Id: Ifdaed4b5e4adc142657c03c8e78b709a99eeddbd Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2014-02-14 00:34:01 +01:00
..
.settings	Disable warning about assigning to parameter	2013-06-15 15:11:54 +02:00
META-INF	Upgrade javaewah to version 0.7.9	2014-01-13 11:47:58 -08:00
exttst/org/eclipse/jgit/patch	Kill GitIndex	2011-11-09 09:16:50 +01:00
tst/org/eclipse/jgit	Use branch.<x>.mergeoptions and merge.ff as defaults for merging	2014-02-14 00:34:01 +01: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.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.3.0-SNAPSHOT builds	2013-12-05 22:42:47 +01:00