Skip to main content
Jump to: navigation, search

Difference between revisions of "JGit/New and Noteworthy/5.12"

(Start the JGit 5.12 N&N)
 
 
Line 12: Line 12:
 
= Contributors =
 
= Contributors =
  
The following X developers worked on this release:
+
The following 10 developers worked on this release:
  
<TBD: list of contributors, number>
+
Adithya Chakilam,
 +
David Ostrovsky,
 +
Han-Wen Nienhuys,
 +
Ivan Frade,
 +
Kyle Zhao,
 +
Marco Miller,
 +
Marija Savtchouk,
 +
Matthias Sohn,
 +
Thomas Wolf,
 +
Youssef Elghareeb

Latest revision as of 14:31, 6 June 2021

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, and CherrypickCommand have new setters to set this org.eclipse.jgit.merge.ContentMergeStrategy. The JGit command-line org.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

Back to the top