Markus Duft d3ed64bcd4 LFS: support merge/rebase/cherry-pick/diff/compare with LFS files ... Respect merge=lfs and diff=lfs attributes where required to replace (in memory) the content of LFS pointers with the actual blob content from the LFS storage (and vice versa when staging/merging). Does not implement general support for merge/diff attributes for any other use case apart from LFS. Change-Id: Ibad8875de1e0bee8fe3a1dffb1add93111534cae Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2018-03-03 11:39:43 +01:00
..
.settings	Ignore warning for minor version change without API change	2017-11-24 01:12:14 +01:00
META-INF	Fix version of slf4j in manifest files	2018-02-02 01:12:20 +01:00
exttst/org/eclipse/jgit	Use constants from StandardCharsets instead of hard-coded strings	2017-12-07 20:02:59 +09:00
src/org/eclipse/jgit	Send a detailed event on working tree modifications	2017-08-15 16:52:00 -04:00
tst/org/eclipse/jgit	LFS: support merge/rebase/cherry-pick/diff/compare with LFS files	2018-03-03 11:39:43 +01:00
tst-rsrc	Support -merge attribute in binary macro	2017-06-27 10:33:50 +02:00
.classpath	Change JGit minimum execution environment to JavaSE-1.8	2016-09-20 11:32:36 +02:00
.gitignore	Extend the FS class for Java7	2013-05-04 02:01:56 +02:00
.project	Remove references to org.eclipse.jgit.java7	2016-08-05 11:22:27 +09:00
BUILD	Format BUILD files with buildifier	2017-08-18 10:01:06 +01:00
build.properties	Add missing dependency to slf4j-log4j bridge	2016-09-05 04:53:14 -04:00
org.eclipse.jgit.core--All-Tests (Java 8) (de).launch	Fixed few locale dependent pgm tests	2016-01-02 17:41:58 +01:00
org.eclipse.jgit.core--All-Tests (Java 8).launch	Fix classpath of test launch configurations	2015-11-21 00:33:43 +01:00
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.test-WalkEncryptionTest-Proxy.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00
org.eclipse.jgit.test-WalkEncryptionTest.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	Prepare 4.11.0-SNAPSHOT builds	2017-12-31 04:05:07 +01:00
tests.bzl	Jsch overrides the port in the URI with the one in ~/.ssh/config	2018-02-14 13:32:37 +01:00