diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-07-06 17:29:23 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-07-06 19:07:45 +0200 |
| commit | 3fc0ec18228d392aecf5d15198e001815726b5d5 (patch) | |
| tree | eec583d62bdde6f49101024e5f20878f90bde5cd /org.eclipse.jgit.pgm/META-INF | |
| parent | c6a64ecae7ea5519bb6460b38d7ec65a83dc6303 (diff) | |
| parent | f6935d8cd2e00d5923917ff869354e443da66014 (diff) | |
| download | jgit-3fc0ec18228d392aecf5d15198e001815726b5d5.tar.gz jgit-3fc0ec18228d392aecf5d15198e001815726b5d5.zip | |
Merge branch 'master' into next
* master: (193 commits)
Add aarch64 environment to target platform configuration
JGit blame very slow for large merge commits that rename files
UploadPack: don't prematurely terminate timer in case of error
Do not create reflog for remote tracking branches during clone
UploadPack: do not check reachability of visible SHA1s
Fix warnings about non-externalized string literals
[sshd] Correct signature for RSA keys from an SSH agent
Run tests that checks araxis output only on Linux
Add missing package import javax.management to org.eclipse.jgit
Add 4.25 target platform for Eclipse 2022-09
Suppress API errors raised for new API introduced in 5.13.1
Eclipse 4.24 was released, adapt p2 URL accordingly
Fix DefaultCharset bug pattern flagged by error prone
Use SystemReader#getDefaultCharset to read console input
Annotate the exception with the possible failure reason when Bitmaps are not enabled.
Prepare 5.13.2-SNAPSHOT builds
JGit v5.13.1.202206130422-r
AmazonS3: Add support for AWS API signature version 4
Fix typo in DiffTools#compare javadoc
Update jgit-last-release-version to 6.2.0.202206071550-r
...
Change-Id: I561a0178f6bc512e8ce7d75f1870a044cb051fac
Diffstat (limited to 'org.eclipse.jgit.pgm/META-INF')
| -rw-r--r-- | org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin | 1 |
1 files changed, 1 insertions, 0 deletions
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 8c44764c63..ea1d1e3faa 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 @@ -25,6 +25,7 @@ org.eclipse.jgit.pgm.LsRemote org.eclipse.jgit.pgm.LsTree org.eclipse.jgit.pgm.Merge org.eclipse.jgit.pgm.MergeBase +org.eclipse.jgit.pgm.MergeTool org.eclipse.jgit.pgm.Push org.eclipse.jgit.pgm.ReceivePack org.eclipse.jgit.pgm.Reflog |