diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-05-26 17:21:02 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-05-26 17:21:30 +0200 |
| commit | 2f2f6e51b9e34034641f640691e4cc155e48153b (patch) | |
| tree | d21824f7c48a3c7501a9f6b47db69ced8373fab3 /org.eclipse.jgit.gpg.bc.test | |
| parent | 4e290d389ab2f56b6e43d091e6542d0a6a36e9b7 (diff) | |
| parent | 0667b8ec4d8b10ebc57271642953de6852c3331b (diff) | |
| download | jgit-2f2f6e51b9e34034641f640691e4cc155e48153b.tar.gz jgit-2f2f6e51b9e34034641f640691e4cc155e48153b.zip | |
Merge branch 'master' into stable-5.12
* master:
RepoCommand: Do not set 'branch' if the revision is a tag
pgm: rewrite parents when --parents flag is passed
ApplyCommand: fix "no newline at end" detection
ApplyCommand: handle completely empty context lines in text patches
ApplyCommand: use byte arrays for text patches, not strings
ApplyCommand: support binary patches
ApplyCommand: add a stream to apply a delta patch
ApplyCommand: add streams to read/write binary patch hunks
ApplyCommand: add a base-85 codec
ApplyCommand: convert to git internal format before applying patch
SSH config: fix whitespace handling
SSH config: fix negated patterns
Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMS
Prepare 5.11.2-SNAPSHOT builds
JGit v5.11.1.202105131744-r
Add a cgit interoperability test for LockFile
Add TemporaryBuffer.toString(int limit)
LockFile: create OutputStream only when needed
Add git config for conflict style merge/diff3
Change-Id: If7751ff99079eaea31ed1fce811d141ecf209727
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.gpg.bc.test')
0 files changed, 0 insertions, 0 deletions