]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ff77d41) | patch
Teach JGit to handle external diff/merge tools defined in .gitattributes 43/166943/21
authorAndre Bossert <andre.bossert@siemens.com>
Tue, 21 Jan 2020 09:13:43 +0000 (10:13 +0100)
committerAndrey Loskutov <loskutov@gmx.de>
Thu, 2 Jun 2022 08:36:39 +0000 (10:36 +0200)
commitc32694e5ae98e5c1373afcb535a76d37e5d82a29
tree3bdd7ef80eccd0177a80b79d8c50d3968046d6ectree | snapshot
parentff77d412a9f1a956b8d76b139489038ee3b0870ccommit | diff
Teach JGit to handle external diff/merge tools defined in .gitattributes

Adds API that allows UI to find (and handle) diff/merge tools, specific
for the given path. The assumption is that user can specify file type
specific diff/merge tools via gitattributes.

Bug: 552840
Change-Id: I1daa091e9afa542a9ebb5417853dff0452ed52dd
Signed-off-by: Mykola Zakharchuk <zakharchuk.vn@gmail.com>
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalDiffToolTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalMergeToolTest.java diff | blob | history
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalToolUtils.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit