jgit/org.eclipse.jgit
Andre Bossert e81085944f Add filtering with help of DirCacheCheckout.getContent()
see: https://git-scm.com/docs/git-mergetool

* refactoring of content (FileElement) handling
* now the temporary files are already filled with filtered content in
the calling classes (PGM), that can be used with EGit content too

TODO:
 * keep the temporaries when no change detected and the user answers no
to the question if the merge was successful

Bug: 356832
Change-Id: I86a0a052d059957d4d152c1bb94c262902c377d2
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
2022-05-30 13:28:32 +02:00
..
.settings [checkout] Use .gitattributes from the commit to be checked out 2022-03-07 18:45:25 +01:00
META-INF Prepare 6.1.1-SNAPSHOT builds 2022-03-08 17:04:10 +01:00
findBugs [spotbugs] Silence NP_BOOLEAN_RETURN_NULL in IgnoreNode#checkIgnored 2020-12-22 10:52:59 +01:00
resources/org/eclipse/jgit Fetch: Introduce negative refspecs. 2022-04-13 10:21:20 -07:00
src/org/eclipse/jgit Add filtering with help of DirCacheCheckout.getContent() 2022-05-30 13:28:32 +02:00
.classpath Bump minimum required Java version to 11 2021-09-29 17:12:12 +02:00
.fbprefs
.gitignore
.project
BUILD Fix stamping to produce stable file timestamps 2020-12-14 15:45:29 +01:00
about.html
build.properties
plugin.properties Fix bundle localization of Apache SSH bundle 2019-06-21 17:54:06 +02:00
pom.xml Prepare 6.1.1-SNAPSHOT builds 2022-03-08 17:04:10 +01:00