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/.settings | |
| 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/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 3adb2f9761..86c13b470f 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,5 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> + <resource path="src/org/eclipse/jgit/diff/DiffEntry.java" type="org.eclipse.jgit.diff.DiffEntry"> + <filter id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.jgit.diff.DiffEntry"/> + <message_argument value="diffAttribute"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> <filter id="336658481"> <message_arguments> |