Skip to main content
Jump to: navigation, search

JGit/New and Noteworthy/5.12

< JGit‎ | New and Noteworthy
Revision as of 12:06, 26 May 2021 by (Talk | contribs) (Start the JGit 5.12 N&N)

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)



  • 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.


The following X developers worked on this release:

<TBD: list of contributors, number>

Back to the top