aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix CheckoutCommand not setting up trackingRobin Stocker2014-08-054-42/+81
* Run unit tests in parallelMatthias Sohn2014-08-041-0/+5
* Merge "Add isRebase to API of BranchConfig"Robin Rosenberg2014-08-032-3/+27
|\
| * Add isRebase to API of BranchConfigRobin Stocker2014-08-032-3/+27
* | Merge "Use bitcheck to check for presence of OPT_FULL option"Robin Rosenberg2014-08-031-6/+1
|\ \
| * | Use bitcheck to check for presence of OPT_FULL optionKevin Sawicki2014-08-021-6/+1
| |/
* / NetRC parser and credentials provider.Alexey Kuznetsov2014-08-034-0/+629
|/
* Enhance BranchConfig API to expose branch.* optionsRobin Stocker2014-08-031-18/+47
* Add IndexDiff tests for merge conflict state BOTH_ADDEDLaurent Goubet2014-08-021-0/+116
* IndexDiffFilter should never filter entries with stage!=0Christian Halstrick2014-08-022-1/+30
* Merge "HistogramDiff: Convert stack recursion to heap managed queue"Robin Rosenberg2014-08-021-6/+14
|\
| * HistogramDiff: Convert stack recursion to heap managed queueShawn Pearce2014-07-251-6/+14
* | Fix Javadoc errors with Java 8Robin Stocker2014-08-023-11/+11
* | Fix API errors raised on ResolveMerger affecting API providers onlyChristian Halstrick2014-07-313-3/+24
* | Implement RepoCommand.Project.hashCode() since we override equals()Matthias Sohn2014-07-301-0/+5
* | Remove @Override annotation illegal for interfaces on Java 5Matthias Sohn2014-07-301-1/+0
* | Mark package org.eclipse.jgit.gitrepo.internal as x-internalMatthias Sohn2014-07-301-1/+1
* | Small performance optimization for ignore rules/fnmatcherAndrey Loskutov2014-07-302-8/+28
* | Added toString() methods for better debugging of ignore rulesAndrey Loskutov2014-07-303-0/+15
* | Fix RevertCommand to correctly revert multiple commits at once.Maik Schreiber2014-07-302-0/+101
* | Merge "Remove overlapping submodules from repo manifest."Shawn Pearce2014-07-292-9/+124
|\ \
| * | Remove overlapping submodules from repo manifest.Yuxuan 'fishy' Wang2014-07-292-9/+124
* | | Merge "Added the missing export in MANIFEST.MF."Shawn Pearce2014-07-291-0/+1
|\ \ \ | |/ / |/| |
| * | Added the missing export in MANIFEST.MF.Yuxuan 'fishy' Wang2014-07-241-0/+1
| |/
* | Merge "RecursiveMerger should not fail on content-merge conflicts of parents"Christian Halstrick2014-07-294-9/+134
|\ \
| * | RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-284-9/+134
* | | Strip trailing /s in repo base URI.Yuxuan 'fishy' Wang2014-07-283-3/+9
|/ /
* | Fixed message for exception thrown during recursive mergeChristian Halstrick2014-07-283-4/+4
* | Fix RecursiveMerger's internal use of merge to find a merge baseChristian Halstrick2014-07-254-1/+194
* | Handle initial checkout correctlyChristian Halstrick2014-07-252-4/+30
|/
* Update SUBMITTING_PATCHESRobin Stocker2014-07-202-106/+44
* Don't prefix output from jgit status with '# 'Robin Rosenberg2014-07-192-76/+76
* Preserve merges during pull if configured to do soKonrad Kügler2014-07-153-23/+256
* Rebase: Add --preserve-merges supportKonrad Kügler2014-07-153-30/+560
* Repository.writeMergeHeads to accept a list with subtypes of ObjectIdKonrad Kügler2014-07-141-2/+2
* Cherry-Pick: Support --no-commitKonrad Kügler2014-07-142-8/+73
* Handle diff formatting when there is nothing to compare withRobin Rosenberg2014-07-063-19/+124
* Eliminate warning about overlapping variable namesRobin Rosenberg2014-07-041-5/+5
* Don't warn for methods that can be staticRobin Rosenberg2014-07-0215-15/+15
* Add new default settings from Eclipse 4.4Robin Rosenberg2014-07-0216-1/+81
* Merge "Clarify comments in message properties files (and fix grammar)"Matthias Sohn2014-07-012-3/+3
|\
| * Clarify comments in message properties files (and fix grammar)Robin Stocker2014-06-302-3/+3
* | Try to fix intermittent test failure related to file timestampsRobin Rosenberg2014-07-011-3/+4
|/
* Fix incorrect "''" in CLIText.propertiesRobin Stocker2014-06-301-1/+1
* Add a comment to the message properties files on how they are processedRobin Rosenberg2014-06-292-0/+8
* Fix spelling error in error messgaeRobin Rosenberg2014-06-291-1/+1
* Remove duplicate string in CLIText.propertiesRobin Rosenberg2014-06-291-1/+0
* Fix formatting errors in error messagesRobin Rosenberg2014-06-292-8/+8
* Merge branch 'stable-3.4'Matthias Sohn2014-06-216-12/+108
|\
| * Prepare 3.4.2-SNAPSHOT buildsMatthias Sohn2014-06-2155-263/+263