Robin Rosenberg 3ad454497c Do not cherry-pick merge commits during rebase ... Rebase computes the list of commits that are included in the merges, just like Git does, so do not try to include the merge commits. Re-recreating merges during rebase is a bit more complicated and might be a useful future extension, but for now just linearize during rebase. Change-Id: I61239d265f395e5ead580df2528e46393dc6bdbd Signed-off-by: Robin Stocker <robin@nibor.org>		2013-03-08 16:40:19 +01:00
..
.settings	Harmonize the JDT settings within JGit	2012-11-16 10:25:45 -08:00
META-INF	Added read/write support for pack bitmap index.	2013-03-05 11:09:44 -08:00
exttst/org/eclipse/jgit/patch	Kill GitIndex	2011-11-09 09:16:50 +01:00
tst/org/eclipse/jgit	Do not cherry-pick merge commits during rebase	2013-03-08 16:40:19 +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	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Enforce the use of Java5 API:s only (with a few exceptions)	2011-12-16 01:01:36 +01: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.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Prepare 2.3.2-SNAPSHOT builds	2013-02-21 02:13:15 +01:00