diff options
| author | Markus Duft <markus.duft@ssi-schaefer.com> | 2018-03-02 10:11:42 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-03-03 11:39:43 +0100 |
| commit | d3ed64bcd467e3e8976b018095e71ed3e3033eae (patch) | |
| tree | 8593dfe6131b1d3f890ebc92b3a78dead4c15e4d /org.eclipse.jgit.lfs/META-INF | |
| parent | 169de08a789b6fc1eb25350e49f4904e11f732cf (diff) | |
| download | jgit-d3ed64bcd467e3e8976b018095e71ed3e3033eae.tar.gz jgit-d3ed64bcd467e3e8976b018095e71ed3e3033eae.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.lfs/META-INF')
| -rw-r--r-- | org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 798fccdfc4..6d94877148 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -18,6 +18,7 @@ Import-Package: com.google.gson;version="[2.8.2,3.0.0)", org.eclipse.jgit.annotations;version="[4.11.0,4.12.0)";resolution:=optional, org.eclipse.jgit.api.errors;version="[4.11.0,4.12.0)", org.eclipse.jgit.attributes;version="[4.11.0,4.12.0)", + org.eclipse.jgit.diff;version="[4.11.0,4.12.0)", org.eclipse.jgit.errors;version="[4.11.0,4.12.0)", org.eclipse.jgit.hooks;version="[4.11.0,4.12.0)", org.eclipse.jgit.internal.storage.file;version="[4.11.0,4.12.0)", @@ -25,6 +26,7 @@ Import-Package: com.google.gson;version="[2.8.2,3.0.0)", org.eclipse.jgit.nls;version="[4.11.0,4.12.0)", org.eclipse.jgit.revwalk;version="[4.11.0,4.12.0)", org.eclipse.jgit.storage.file;version="[4.11.0,4.12.0)", + org.eclipse.jgit.storage.pack;version="[4.11.0,4.12.0)", org.eclipse.jgit.transport;version="[4.11.0,4.12.0)", org.eclipse.jgit.transport.http;version="[4.11.0,4.12.0)", org.eclipse.jgit.treewalk;version="[4.11.0,4.12.0)", |