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.pgm/META-INF | |
| 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.pgm/META-INF')
| -rw-r--r-- | org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 1ebd3a3e4c..fa0f452c59 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -24,6 +24,7 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", org.eclipse.jgit.gitrepo;version="[6.1.0,6.2.0)", org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.1.0,6.2.0)", org.eclipse.jgit.internal.storage.io;version="[6.1.0,6.2.0)", org.eclipse.jgit.internal.storage.pack;version="[6.1.0,6.2.0)", org.eclipse.jgit.internal.storage.reftable;version="[6.1.0,6.2.0)", @@ -33,6 +34,7 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jgit.lfs.server.s3;version="[6.1.0,6.2.0)", org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", org.eclipse.jgit.merge;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib.internal;version="[6.1.0,6.2.0)", org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", org.eclipse.jgit.notes;version="[6.1.0,6.2.0)", org.eclipse.jgit.revplot;version="[6.1.0,6.2.0)", diff --git a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin index e645255e96..8c44764c63 100644 --- a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin +++ b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin @@ -12,6 +12,7 @@ org.eclipse.jgit.pgm.ConvertRefStorage org.eclipse.jgit.pgm.Daemon org.eclipse.jgit.pgm.Describe org.eclipse.jgit.pgm.Diff +org.eclipse.jgit.pgm.DiffTool org.eclipse.jgit.pgm.DiffTree org.eclipse.jgit.pgm.Fetch org.eclipse.jgit.pgm.Gc |