Skip to main content

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.

Jump to: navigation, search

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

(RmCommand setCached)
(Make bug references into links)
Line 9: Line 9:
 
= Recursive Merge Support =
 
= Recursive Merge Support =
  
JGit now supports recursive merge strategy (bug 380314)
+
JGit now supports recursive merge strategy ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=380314 bug 380314])
  
 
= Porcelain Commands =
 
= Porcelain Commands =
Line 19: Line 19:
  
 
=={{code|MergeCommand}}==
 
=={{code|MergeCommand}}==
* support for --no-ff while merging (bug 394432)
+
* support for --no-ff while merging ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394432 bug 394432])
  
 
=={{code|CheckoutCommand}}==
 
=={{code|CheckoutCommand}}==
* supports checking out 'ours' and 'theirs' (bug 390147)
+
* supports checking out 'ours' and 'theirs' ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=390147 bug 390147])
  
 
=={{code|MergeCommand}}==
 
=={{code|MergeCommand}}==
* Add support for rebase interactive 'edit' command (bug 394577)
+
* Add support for rebase interactive 'edit' command ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394577 bug 394577])
* Add support for rebase interactive 'reword' command (bug 394575)
+
* Add support for rebase interactive 'reword' command ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394575 bug 394575])
  
 
=={{code|RmCommand}}==
 
=={{code|RmCommand}}==
Line 32: Line 32:
  
 
= Command Line =
 
= Command Line =
* Added git-reflog to the CLI (bug 394497)
+
* Added git-reflog to the CLI ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394497 bug 394497])
 
* Add --squash option to org.eclipse.jgit.pgm.Merge
 
* Add --squash option to org.eclipse.jgit.pgm.Merge
 
* Have git-ls tree to accept path args like git-ls-tree
 
* Have git-ls tree to accept path args like git-ls-tree
* Added new Status CLI command 'jgit status' (bug 348318)
+
* Added new Status CLI command 'jgit status' ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=348318 bug 348318])
  
 
= Performance improvements =
 
= Performance improvements =

Revision as of 07:43, 4 December 2012

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

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/

Recursive Merge Support

JGit now supports recursive merge strategy (bug 380314)

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

Copyright © Eclipse Foundation, Inc. All Rights Reserved.