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

From Eclipsepedia

Jump to: navigation, search
(Make bug references into links)
(Recursive Merge Support)
Line 7: Line 7:
 
https://git.eclipse.org/r/#/c/8345/
 
https://git.eclipse.org/r/#/c/8345/
  
= Recursive Merge Support =
 
  
JGit now supports recursive merge strategy ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=380314 bug 380314])
 
  
 
= Porcelain Commands =
 
= Porcelain Commands =

Revision as of 20:02, 7 December 2012

THIS IS TENTATIVE! RELEASE DATE: 12/19/2012

Contents

RevWalk support for shallow clones

StartGenerator now processes .git/shallow to have the RevWalk stop for shallow commits (gerrit #8345)

https://git.eclipse.org/r/#/c/8345/


Porcelain Commands

GarbageCollectCommand

  • add initial GarbageCollectCommand implementation

PullCommand

  • support for pull with --rebase and --no-rebase

MergeCommand

CheckoutCommand

  • supports checking out 'ours' and 'theirs' (bug 390147)

MergeCommand

  • Add support for rebase interactive 'edit' command (bug 394577)
  • Add support for rebase interactive 'reword' command (bug 394575)

RmCommand

  • Support for --cached (setCached(true)), which only removes from index (bug 395599)

Command Line

  • Added git-reflog to the CLI (bug 394497)
  • Add --squash option to org.eclipse.jgit.pgm.Merge
  • Have git-ls tree to accept path args like git-ls-tree
  • Added new Status CLI command 'jgit status' (bug 348318)

Performance improvements

  • TODO

Bug Fixes

10 Bugs and 10 enhancement requests were closed