Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "JGit/New and Noteworthy/5.12"
< JGit | New and Noteworthy
(Start the JGit 5.12 N&N) |
|||
(One intermediate revision by the same user not shown) | |||
Line 12: | Line 12: | ||
= Contributors = | = Contributors = | ||
− | The following | + | The following 10 developers worked on this release: |
− | + | Adithya Chakilam, | |
+ | David Ostrovsky, | ||
+ | Han-Wen Nienhuys, | ||
+ | Ivan Frade, | ||
+ | Kyle Zhao, | ||
+ | Marco Miller, | ||
+ | Marija Savtchouk, | ||
+ | Matthias Sohn, | ||
+ | Thomas Wolf, | ||
+ | Youssef Elghareeb | ||
+ | |||
+ | [[Category:JGit]] |
Latest revision as of 22:41, 29 November 2023
JGit
Commands
-
org.eclipse.jgit.lib.ApplyCommand
has been enhanced to handle more cases. It now also supports applying binary delta or literal patch hunks. - Merging now supports the content merge strategies ours and theirs. They replace in text conflicts all conflicting hunks by the "ours" or "theirs" version; they correspond to git merge -X ours/theirs.
org.eclipse.jgit.lib.MergeCommand
,PullCommand
,RebaseCommand
,StashApplyCommand
, andCherrypickCommand
have new setters to set thisorg.eclipse.jgit.merge.ContentMergeStrategy
. The JGit command-lineorg.eclipse.jgit.pgm.Merge
command now supports the -X or --strategy-option command-line option. See the official git documentation for more information about the -X option.
Other Changes
The complete list of new features and bug fixes is available in the release notes.
Contributors
The following 10 developers worked on this release:
Adithya Chakilam, David Ostrovsky, Han-Wen Nienhuys, Ivan Frade, Kyle Zhao, Marco Miller, Marija Savtchouk, Matthias Sohn, Thomas Wolf, Youssef Elghareeb