diff options
author | Andre Bossert <andre.bossert@siemens.com> | 2019-02-23 15:25:10 +0100 |
---|---|---|
committer | Simeon Andreev <simeon.danailov.andreev@gmail.com> | 2021-11-25 18:17:16 +0100 |
commit | 48f4d97a226a2c9be4577b916cc0b99ce870939a (patch) | |
tree | fcb823d8e8ae96d8890561990f9f2d3eab2c8534 /org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java | |
parent | 4453a6e04292e149bd69fe45a6383590cc1a60ab (diff) | |
download | jgit-48f4d97a226a2c9be4577b916cc0b99ce870939a.tar.gz jgit-48f4d97a226a2c9be4577b916cc0b99ce870939a.zip |
Add command line support for "git difftool"
see: http://git-scm.com/docs/git-difftool
* add command line support for "jgit difftool"
* show supported commands with "jgit difftool --help"
* added "git difftool --tool-help" to show the tools (empty now)
* prepare for all other commands
Bug: 356832
Change-Id: Ice0c13ef7953a20feaf25e7746d62b94ff4e89e5
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java')
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java new file mode 100644 index 0000000000..f2d7e828cb --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.diffmergetool; + +/** + * The external tool interface. + */ +public interface ExternalDiffTool { + + /** + * @return the tool name + */ + String getName(); + + /** + * @return the tool path + */ + String getPath(); + + /** + * @return the tool command + */ + String getCommand(); + +} |